Import of pkgsrc-2015Q2

This commit is contained in:
2016-01-21 23:41:46 +01:00
committed by sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
+36 -17
View File
@@ -1,28 +1,30 @@
# $NetBSD: Makefile,v 1.88 2014/05/05 00:47:35 ryoon Exp $
# $NetBSD: Makefile,v 1.92 2015/04/25 14:20:18 tnn Exp $
DISTNAME= audacity-src-1.2.6
PKGREVISION= 26
PKGNAME= ${DISTNAME:S/-src-/-/}
DISTNAME= audacity-minsrc-2.1.0
PKGNAME= ${DISTNAME:S/-minsrc//1}
PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=audacity/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://audacity.sourceforge.net/
COMMENT= Audio editor
MAKE_JOBS_SAFE= no
LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
USE_LIBTOOL= yes
USE_TOOLS+= autoconf gmake msgfmt pkg-config zip:run
USE_TOOLS+= autoconf gmake intltool msgfmt msgmerge pkg-config
USE_TOOLS+= xgettext zip:run
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-xaudio
CONFIGURE_ARGS+= --with-id3=system
CONFIGURE_ARGS+= --with-libmad=system
CONFIGURE_ARGS+= --with-libsndfile=system
CONFIGURE_ARGS+= --with-portaudio=system
CONFIGURE_ARGS+= --with-vorbis=system
CONFIGURE_ENV+= WX_CONFIG=${LOCALBASE}/bin/wx24-config
CONFIGURE_ARGS+= --with-expat=system --without-xaudio
CONFIGURE_ARGS+= --with-ffmpeg=system --with-libflac=system
CONFIGURE_ARGS+= --with-id3tag=system --with-libmad=system
CONFIGURE_ARGS+= --with-vorbis=system --with-sbsms=system
CONFIGURE_ARGS+= --with-libsamplerate=system --with-soundtouch=system
CONFIGURE_ARGS+= --with-twolame=system --with-lv2=system
CONFIGURE_ARGS+= --with-libsndfile=system --with-portaudio=local
CONFIGURE_ARGS+= --enable-nyquist=yes --with-midi=local
CONFIG_GUESS_OVERRIDE= \
config.guess */config.guess */*/config.guess */*/*/config.guess
@@ -30,16 +32,33 @@ CONFIG_SUB_OVERRIDE= \
config.sub */config.sub */*/config.sub */*/*/config.sub
PTHREAD_AUTO_VARS= yes
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
.include "options.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../audio/lilv/buildlink3.mk"
.include "../../audio/lv2/buildlink3.mk"
.include "../../audio/soundtouch/buildlink3.mk"
BUILDLINK_API_DEPENDS.twolame+= twolame>=0.3.9
.include "../../audio/twolame/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libsbsms/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/portaudio/buildlink3.mk"
#.include "../../audio/portaudio-devel/buildlink3.mk" # Needs Pa_GetStreamHostApiType
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/wxGTK24/buildlink3.mk"
BUILDLINK_API_DEPENDS.flac+= flac>=1.3.0
.include "../../audio/flac/buildlink3.mk"
.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/wxGTK28/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+112 -39
View File
@@ -1,67 +1,140 @@
@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:32:02 joerg Exp $
@comment $NetBSD: PLIST,v 1.10 2015/04/20 13:38:23 rodent Exp $
bin/audacity
man/man1/audacity.1
share/audacity/audacity-1.2-help.htb
share/appdata/audacity.appdata.xml
share/applications/audacity.desktop
share/audacity/EQDefaultCurves.xml
share/audacity/include/audacity/ConfigInterface.h
share/audacity/include/audacity/EffectAutomationParameters.h
share/audacity/include/audacity/EffectInterface.h
share/audacity/include/audacity/IdentInterface.h
share/audacity/include/audacity/ImporterInterface.h
share/audacity/include/audacity/ModuleInterface.h
share/audacity/include/audacity/PluginInterface.h
share/audacity/include/audacity/Types.h
share/audacity/nyquist/bug.lsp
share/audacity/nyquist/dspprims.lsp
share/audacity/nyquist/envelopes.lsp
share/audacity/nyquist/equalizer.lsp
share/audacity/nyquist/evalenv.lsp
share/audacity/nyquist/fileio.lsp
share/audacity/nyquist/follow.lsp
share/audacity/nyquist/init.lsp
share/audacity/nyquist/misc.lsp
share/audacity/nyquist/nyinit.lsp
share/audacity/nyquist/nyqmisc.lsp
share/audacity/nyquist/nyquist-plot.txt
share/audacity/nyquist/nyquist.lsp
share/audacity/nyquist/printrec.lsp
share/audacity/nyquist/profile.lsp
share/audacity/nyquist/rawwaves/mand1.raw
share/audacity/nyquist/rawwaves/mand10.raw
share/audacity/nyquist/rawwaves/mand11.raw
share/audacity/nyquist/rawwaves/mand12.raw
share/audacity/nyquist/rawwaves/mand2.raw
share/audacity/nyquist/rawwaves/mand3.raw
share/audacity/nyquist/rawwaves/mand4.raw
share/audacity/nyquist/rawwaves/mand5.raw
share/audacity/nyquist/rawwaves/mand6.raw
share/audacity/nyquist/rawwaves/mand7.raw
share/audacity/nyquist/rawwaves/mand8.raw
share/audacity/nyquist/rawwaves/mand9.raw
share/audacity/nyquist/rawwaves/mandpluk.raw
share/audacity/nyquist/rawwaves/marmstk1.raw
share/audacity/nyquist/rawwaves/sinewave.raw
share/audacity/nyquist/sal-parse.lsp
share/audacity/nyquist/sal.lsp
share/audacity/nyquist/seq.lsp
share/audacity/nyquist/seqfnint.lsp
share/audacity/nyquist/seqmidi.lsp
share/audacity/nyquist/sndfnint.lsp
share/audacity/nyquist/stk.lsp
share/audacity/nyquist/system.lsp
share/audacity/nyquist/test.lsp
share/audacity/nyquist/xlinit.lsp
share/audacity/nyquist/xm.lsp
share/audacity/plug-ins/SilenceMarker.ny
share/audacity/plug-ins/SoundFinder.ny
share/audacity/plug-ins/StudioFadeOut.ny
share/audacity/plug-ins/adjustable-fade.ny
share/audacity/plug-ins/beat.ny
share/audacity/plug-ins/clicktrack.ny
share/audacity/plug-ins/crossfadein.ny
share/audacity/plug-ins/crossfadeout.ny
share/audacity/plug-ins/clipfix.ny
share/audacity/plug-ins/crossfadetracks.ny
share/audacity/plug-ins/delay.ny
share/audacity/plug-ins/equalabel.ny
share/audacity/plug-ins/highpass.ny
share/audacity/plug-ins/lowpass.ny
share/audacity/plug-ins/notch.ny
share/audacity/plug-ins/pluck.ny
share/audacity/plug-ins/rissetdrum.ny
share/audacity/plug-ins/sample-data-export.ny
share/audacity/plug-ins/tremolo.ny
share/audacity/plug-ins/vocalremover.ny
share/audacity/plug-ins/vocoder.ny
share/doc/audacity/LICENSE.txt
share/doc/audacity/README.txt
share/locale/af/LC_MESSAGES/audacity.mo
share/locale/ar/LC_MESSAGES/audacity.mo
share/locale/bg/LC_MESSAGES/audacity.mo
share/locale/bn/LC_MESSAGES/audacity.mo
share/locale/ca/LC_MESSAGES/audacity.mo
share/locale/cs/LC_MESSAGES/audacity.mo
share/locale/cy/LC_MESSAGES/audacity.mo
share/locale/da/LC_MESSAGES/audacity.mo
share/locale/de/LC_MESSAGES/audacity.mo
share/locale/el/LC_MESSAGES/audacity.mo
share/locale/es/LC_MESSAGES/audacity.mo
share/locale/eu/LC_MESSAGES/audacity.mo
share/locale/fi/LC_MESSAGES/audacity.mo
share/locale/fr/LC_MESSAGES/audacity.mo
share/locale/ga/LC_MESSAGES/audacity.mo
share/locale/gl/LC_MESSAGES/audacity.mo
share/locale/hu/LC_MESSAGES/audacity.mo
share/locale/it/LC_MESSAGES/audacity.mo
share/locale/ja/LC_MESSAGES/audacity.mo
share/locale/lt/LC_MESSAGES/audacity.mo
share/locale/mk/LC_MESSAGES/audacity.mo
share/locale/nb/LC_MESSAGES/audacity.mo
share/locale/nl/LC_MESSAGES/audacity.mo
share/locale/pl/LC_MESSAGES/audacity.mo
share/locale/pt/LC_MESSAGES/audacity.mo
share/locale/ro/LC_MESSAGES/audacity.mo
share/locale/ru/LC_MESSAGES/audacity.mo
share/locale/sk/LC_MESSAGES/audacity.mo
share/locale/sl/LC_MESSAGES/audacity.mo
share/locale/sv/LC_MESSAGES/audacity.mo
share/locale/tr/LC_MESSAGES/audacity.mo
share/locale/uk/LC_MESSAGES/audacity.mo
share/locale/zh/LC_MESSAGES/audacity.mo
share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/icons/hicolor/16x16/apps/audacity.png
share/icons/hicolor/22x22/apps/audacity.png
share/icons/hicolor/24x24/apps/audacity.png
share/icons/hicolor/32x32/apps/audacity.png
share/icons/hicolor/48x48/apps/audacity.png
share/icons/hicolor/scalable/apps/audacity.svg
${PLIST.nls}share/locale/af/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ar/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/be/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/bg/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/bn/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/bs/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ca/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ca@valencia/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/cs/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/cy/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/da/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/de/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/el/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/es/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/eu/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/fa/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/fi/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/fr/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ga/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/gl/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/he/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/hi/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/hr/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/hu/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/hy/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/id/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/it/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ja/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ka/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/km/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ko/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/lt/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/mk/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/my/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/nb/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/nl/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/oc/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/pl/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/pt/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ro/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ru/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/sk/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/sl/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/sr_RS/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/sr_RS@latin/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/sv/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/ta/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/tg/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/tr/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/uk/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/vi/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/zh/LC_MESSAGES/audacity.mo
${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/audacity.mo
share/mime/packages/audacity.xml
share/pixmaps/audacity.xpm
share/pixmaps/audacity16.xpm
share/pixmaps/audacity32.xpm
share/pixmaps/gnome-mime-application-x-audacity-project.xpm
+13 -26
View File
@@ -1,27 +1,14 @@
$NetBSD: distinfo,v 1.23 2013/12/10 14:23:44 jperkin Exp $
$NetBSD: distinfo,v 1.27 2015/04/27 23:50:38 joerg Exp $
SHA1 (audacity-src-1.2.6.tar.gz) = 1bfdd119fdc09d1aa334aee21d4831ef6e939fce
RMD160 (audacity-src-1.2.6.tar.gz) = f59ca075ae430a518b77ce2ed08441abe2b67a0c
Size (audacity-src-1.2.6.tar.gz) = 4882379 bytes
SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
SHA1 (patch-ac) = 2baaf1650c9bdc627000e8676f0ac6ec16b6ec26
SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046
SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4
SHA1 (patch-af) = 05c1c345ef9b92410fbe4d8b4b46ab4b7ba7a226
SHA1 (patch-ag) = 68bcbd932cd4440bc9090c6afc369cfcae54a16b
SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
SHA1 (patch-ai) = 625cd6337d8a246d1a9c388279efa0ade34a2093
SHA1 (patch-aj) = 34b4cdd266345f04954983cc14e4b762f09f4df8
SHA1 (patch-ak) = 5f012eb47c832a8f11bcfbdcaf0ab2e876abd04e
SHA1 (patch-al) = 224437cc76e1f25d600e859d278ad73bbf261efa
SHA1 (patch-am) = 3210d8632ee9f5361008277e2c887f24d87205a1
SHA1 (patch-ba) = c27676c7110bf6ef2fcd448d68402b7bfd21b631
SHA1 (patch-bb) = 050c6edc0a174e2496ef0b572002eca185bd38de
SHA1 (patch-bc) = 8a08526c37e025a89a747fa2c7a48668fe797572
SHA1 (patch-bd) = dc24c670cdf078f08c29318c5c5dc8efed398f59
SHA1 (patch-lib-src_soundtouch_source_SoundTouch_FIRFilter.cpp) = 4d4aee4af18a5211074bdce7cc30507b42337941
SHA1 (patch-lib-src_soundtouch_source_SoundTouch_Makefile.in) = 882de67691e6b7b4b611ead0e1fe20ebafa57d40
SHA1 (patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c) = 4c78a5b39ea0fc1d022c8bfabd68a77989b33a54
SHA1 (patch-src_AudioIO.cpp) = 79af6045ae0a9ff754ae0ea30d987f47363df18f
SHA1 (patch-src_effects_NoiseRemoval.cpp) = 1487650a4784feb5d57ee0ceeda3346fb4abf8de
SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
SHA1 (patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c) = 3724b3e7cdd1f45cd38c76f2da3a3af6048dddb3
SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = a0d194f7f7f278cfba1f54269e0323990abb73f3
SHA1 (patch-src_effects_NoiseRemoval.cpp) = 6d72545cde66ac90d4eb3821a3a3f384ccbf46f2
SHA1 (patch-src_effects_VST_VSTEffect.cpp) = 76a55afd7977505801dd129e139c9782bfd8dfcb
+47
View File
@@ -0,0 +1,47 @@
# $NetBSD: options.mk,v 1.2 2015/04/21 03:34:22 rodent Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.audacity
PKG_SUPPORTED_OPTIONS= alsa debug jack ladspa nls
PKG_SUGGESTED_OPTIONS+= gtk2 ladspa nls
PKG_OPTIONS_OPTIONAL_GROUPS+= gui
PKG_OPTIONS_GROUP.gui= gtk2 gtk3
PLIST_VARS+= nls
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
BROKEN= error: 'ESTRPIPE' undeclared
.endif
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --enable-debug=yes
.else
CONFIGURE_ARGS+= --enable-debug=no
.endif
.if !empty(PKG_OPTIONS:Mgtk2)
.include "../../x11/gtk2/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Mgtk3)
.include "../../x11/gtk3/buildlink3.mk"
CONFIGURE_ARGS+= --enable-gtk3
BROKEN= gtk3 option needs work
.endif
.if !empty(PKG_OPTIONS:Mjack)
.include "../../audio/jack/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mladspa)
.include "../../audio/ladspa/buildlink3.mk"
CONFIGURE_ARGS+= --enable-ladspa=yes
.else
CONFIGURE_ARGS+= --enable-ladspa=no
.endif
.if !empty(PKG_OPTIONS:Mnls)
.include "../../devel/gettext-lib/buildlink3.mk"
PLIST.nls= yes
.else
CONFIGURE_ARGS+= --disable-nls
.endif
+5 -3
View File
@@ -1,7 +1,9 @@
$NetBSD: patch-aa,v 1.4 2004/04/20 18:02:16 ben Exp $
$NetBSD: patch-aa,v 1.5 2015/04/20 13:38:23 rodent Exp $
--- lib-src/libnyquist/cmt/cext.h.orig Sat Mar 6 16:02:24 2004
+++ lib-src/libnyquist/cmt/cext.h
Undefine NEED_ULONG.
--- lib-src/libnyquist/nyquist/cmt/cext.h.orig 2015-03-02 01:07:22.000000000 +0000
+++ lib-src/libnyquist/nyquist/cmt/cext.h
@@ -52,6 +52,8 @@ EXIT(n) -- calls exit(n) after shutting
#if HAS_SYS_TYPES_H
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ab,v 1.3 2004/04/20 18:02:16 ben Exp $
--- lib-src/libnyquist/sys/term.c.orig Sat Mar 6 16:02:50 2004
+++ lib-src/libnyquist/sys/term.c
@@ -40,7 +40,7 @@ int term_testchar()
#else
#include <termios.h>
-#ifndef __APPLE__
+#ifdef __LINUX__
#include <asm/ioctls.h>
#endif
#include <signal.h>
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ac,v 1.4 2012/02/15 20:01:54 hans Exp $
--- lib-src/libnyquist/snd/sndconfig.h.orig Sat Feb 28 11:19:39 2004
+++ lib-src/libnyquist/snd/sndconfig.h
@@ -60,7 +60,7 @@ void snd_free(void *a);
#elif defined(IRIX)
#include "sndirix.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun)
#include "sndfreebsd.h"
#elif defined(_WIN32)
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ad,v 1.4 2005/10/03 20:42:59 joerg Exp $
--- lib-src/libnyquist/snd/sndio.c.orig Sat Feb 28 11:19:39 2004
+++ lib-src/libnyquist/snd/sndio.c
@@ -20,7 +20,7 @@
#ifdef WIN32
#include <sys/stat.h>
#include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/stat.h>
#else
#endif
-97
View File
@@ -1,97 +0,0 @@
$NetBSD: patch-ae,v 1.6 2007/02/23 03:27:41 rillig Exp $
--- configure.in.orig 2005-11-27 03:33:31.000000000 +0100
+++ configure.in 2007-02-23 02:06:19.000000000 +0100
@@ -556,8 +556,8 @@ if [[ "$use_portaudio" = "v19" ]] ; then
AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
-else
-
+fi
+if [[ "$use_portaudio" = "v18" ]] ; then
CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
case "${host_os}" in
@@ -639,6 +639,81 @@ else
esac
fi
+if [[ "$use_portaudio" = "system" ]] ; then
+
+ LIBS="$LIBS -lportaudio"
+
+ case "${host_os}" in
+ darwin* | rhapsody*)
+ dnl Mac OS X configuration
+
+ CONFIGHEADER="configunix.h"
+
+ dnl CoreAudio
+
+ CXXFLAGS="-I../mac $CXXFLAGS"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
+ fi
+
+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
+ LIBS="-framework CoreAudio $LIBS -lz"
+
+ EXTRATARGETS="../Audacity.app"
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ dnl VST
+
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
+
+ ;;
+
+ cygwin*)
+ dnl Windows/CygWin configuration
+
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
+ LIBS="$LIBS -Wl,--subsystem,windows"
+ CONFIGHEADER="configwin.h"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
+ fi
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ AC_DEFINE(__CYGWIN__,1,[We're using cygwin])
+ AC_DEFINE(_FILE_OFFSET_BITS,32,[Placeholder for large file support])
+
+ AFTERBUILD=""
+ ;;
+
+ *)
+ dnl Unix OSS configuration
+
+ CONFIGHEADER="configunix.h"
+
+ if [[ "$use_portmixer" = "yes" ]] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
+ fi
+
+ if [[ "$use_ladspa" = "default" ]] ; then
+ use_ladspa="yes";
+ fi
+
+ AFTERBUILD=""
+
+ esac
+fi
use_precomp="no"
-105
View File
@@ -1,105 +0,0 @@
$NetBSD: patch-af,v 1.6 2007/02/23 03:37:55 rillig Exp $
The CPPFLAGS and LIBS from wx-config had been set too early in the
configure file, so that they were taken into the AC_CONFIG_SUBDIRS
directories. Some of these directories only use a C compiler for
linking, which of course caused problems with the wx* libraries, which
are C++.
--- configure.orig 2006-11-15 05:12:13.000000000 +0100
+++ configure 2007-02-23 04:17:41.000000000 +0100
@@ -6586,7 +6586,8 @@ fi
subdirs="$subdirs lib-src/portaudio-v19"
-else
+fi
+if [ "$use_portaudio" = "v18" ] ; then
CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
@@ -6672,6 +6673,84 @@ _ACEOF
esac
fi
+if [ "$use_portaudio" = "system" ] ; then
+
+ LIBS="$LIBS -lportaudio"
+
+ case "${host_os}" in
+ darwin* | rhapsody*)
+
+ CONFIGHEADER="configunix.h"
+
+
+ CXXFLAGS="-I../mac $CXXFLAGS"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_mac_core/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_mac_core/portmixer.a"
+ fi
+
+ LIBS="-framework AudioUnit -framework AudioToolbox $LIBS"
+ LIBS="-framework CoreAudio $LIBS -lz"
+
+ EXTRATARGETS="../Audacity.app"
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/LoadVSTMac.o"
+ OPTOBJS="$OPTOBJS \$(OBJDIR)/effects/VST/VSTEffect.o"
+
+ ;;
+
+ cygwin*)
+
+ LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lwsock32 -lwinmm"
+ LIBS="$LIBS -Wl,--subsystem,windows"
+ CONFIGHEADER="configwin.h"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_win_wmme/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_win_wmme/portmixer.a Audacity.coff"
+ fi
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define __CYGWIN__ 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _FILE_OFFSET_BITS 32
+_ACEOF
+
+
+ AFTERBUILD=""
+ ;;
+
+ *)
+
+ CONFIGHEADER="configunix.h"
+
+ if [ "$use_portmixer" = "yes" ] ; then
+ BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
+ EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"
+ fi
+
+ if [ "$use_ladspa" = "default" ] ; then
+ use_ladspa="yes";
+ fi
+
+ AFTERBUILD=""
+
+ esac
+fi
use_precomp="no"
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ag,v 1.5 2006/01/17 21:50:23 adam Exp $
--- lib-src/libnyquist/Makefile.in.orig 2006-01-17 22:33:39.000000000 +0100
+++ lib-src/libnyquist/Makefile.in
@@ -6,7 +6,7 @@
INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
CC = @CC@
-override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
+override CFLAGS += -DCMTSTUFF -DEXT $(INCL)
LN = $(CC)
LFLAGS = -lm
-17
View File
@@ -1,17 +0,0 @@
$NetBSD: patch-ah,v 1.4 2004/11/22 16:36:31 adam Exp $
--- Makefile.in.orig 2004-11-18 06:17:29.000000000 +0000
+++ Makefile.in
@@ -37,9 +37,9 @@ install: audacity
# install manpage
$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
- -test -f help/audacity.1.gz && \
- $(INSTALL) -m 644 help/audacity.1.gz \
- $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
+ -test -f help/audacity.1 && \
+ $(INSTALL) -m 644 help/audacity.1 \
+ $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1
# install nyquist
$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
-20
View File
@@ -1,20 +0,0 @@
$NetBSD: patch-ai,v 1.5 2007/02/23 03:27:41 rillig Exp $
--- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp 2007-02-23 03:25:18.000000000 +0100
@@ -80,6 +80,7 @@ uint detectCPUextensions(void)
if (_dwDisabledISA == 0xffffffff) return 0;
asm volatile(
+ "\n\tpushl %%ebx"
"\n\txor %%esi, %%esi" // clear %%esi = result register
// check if 'cpuid' instructions is available by toggling eflags bit 21
@@ -128,6 +129,7 @@ uint detectCPUextensions(void)
"\n\tend:"
"\n\tmov %%esi, %0"
+ "\n\tpopl %%ebx"
: "=r" (res)
: /* no inputs */
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-aj,v 1.3 2005/10/03 20:42:59 joerg Exp $
--- lib-src/libnyquist/snd/sndcvt.c.orig 2005-07-22 17:15:57.000000000 +0000
+++ lib-src/libnyquist/snd/sndcvt.c
@@ -16,7 +16,7 @@
#ifdef WIN32
#include <sys/stat.h>
#include "io.h"
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/stat.h>
#endif /* WIN32 */
#define L_SET SEEK_SET
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-ak,v 1.5 2007/02/23 03:37:55 rillig Exp $
--- lib-src/soundtouch/include/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/include/STTypes.h 2007-02-23 04:23:58.000000000 +0100
@@ -132,7 +132,7 @@ namespace soundtouch
#define ALLOW_3DNOW 1
#endif
- #if (WIN32 || __i386__ || __x86_64__)
+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
#define ALLOW_SSE 1
#endif
#endif
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-al,v 1.5 2007/02/23 03:37:55 rillig Exp $
--- lib-src/soundtouch/soundtouch/STTypes.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/soundtouch/soundtouch/STTypes.h 2007-02-23 04:23:13.000000000 +0100
@@ -132,7 +132,7 @@ namespace soundtouch
#define ALLOW_3DNOW 1
#endif
- #if (WIN32 || __i386__ || __x86_64__)
+ #if (WIN32 || __i386__ || __x86_64__) && (!defined(__GNUC__) || defined(__SSE__))
#define ALLOW_SSE 1
#endif
#endif
+12 -10
View File
@@ -1,13 +1,15 @@
$NetBSD: patch-am,v 1.5 2008/03/20 15:58:47 drochner Exp $
$NetBSD: patch-am,v 1.6 2015/04/20 13:38:23 rodent Exp $
--- src/AudacityApp.cpp.orig 2006-11-15 05:12:11.000000000 +0100
Don't hardcode TMPDIR.
--- src/AudacityApp.cpp.orig 2015-03-02 01:06:58.000000000 +0000
+++ src/AudacityApp.cpp
@@ -391,7 +391,7 @@ bool AudacityApp::OnInit()
// * The user's .audacity-files directory in their home directory
// * The "share" and "share/doc" directories in their install path
@@ -1096,7 +1096,7 @@ bool AudacityApp::OnInit()
* The "share" and "share/doc" directories in their install path */
#ifdef __WXGTK__
- defaultTempDir.Printf("/tmp/audacity1.2-%s", wxGetUserId().c_str());
+ defaultTempDir.Printf("%s/.audacity1.2-%s", home.c_str(), wxGetUserId().c_str());
wxString pathVar = wxGetenv("AUDACITY_PATH");
if (pathVar != "")
AddMultiPathsToPathList(pathVar, audacityPathList);
/* On Unix systems, the default temp dir is in /var/tmp. */
- defaultTempDir.Printf(wxT("/var/tmp/audacity-%s"), wxGetUserId().c_str());
+ defaultTempDir.Printf(wxT("%s/.audacity1.2-%s"), home.c_str(), wxGetUserId().c_str());
wxString pathVar = wxGetenv(wxT("AUDACITY_PATH"));
if (pathVar != wxT(""))
-24
View File
@@ -1,24 +0,0 @@
$NetBSD: patch-ba,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- lib-src/allegro/strparse.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/allegro/strparse.cpp
@@ -16,8 +16,9 @@ char String_parse::peek()
}
-void String_parse::get_nonspace_quoted(char *field)
+void String_parse::get_nonspace_quoted(char *field, int flen)
{
+ char *ofield = field;
skip_space();
bool quoted = false;
if (string[pos] == '"') {
@@ -25,7 +26,7 @@ void String_parse::get_nonspace_quoted(c
*field++ = '"';
pos = pos + 1;
}
- while (string[pos] && (quoted || !isspace(string[pos]))) {
+ while (string[pos] && (quoted || !isspace(string[pos])) && (field - ofield) < (flen - 2)) {
if (string[pos] == '"') {
if (quoted) {
*field++ = '"';
-13
View File
@@ -1,13 +0,0 @@
$NetBSD: patch-bb,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- lib-src/allegro/strparse.h.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/allegro/strparse.h
@@ -10,7 +10,7 @@ public:
}
void skip_space();
char peek();
- void get_nonspace_quoted(char *field);
+ void get_nonspace_quoted(char *field, int flen);
};
void string_escape(char *result, char *str, char *quote);
-30
View File
@@ -1,30 +0,0 @@
$NetBSD: patch-bc,v 1.1 2009/01/13 12:38:49 drochner Exp $
--- ./lib-src/allegro/allegrord.cpp.orig 2006-11-15 05:12:11.000000000 +0100
+++ ./lib-src/allegro/allegrord.cpp
@@ -109,10 +109,10 @@ bool Allegro_reader::parse()
bool new_note_flag = false; // "A"-"G" syntax
int new_note = 0;
Parameters_ptr attributes = NULL;
- line_parser.get_nonspace_quoted(field);
+ line_parser.get_nonspace_quoted(field, field_max);
char pk = line_parser.peek();
if (pk && !isspace(pk)) {
- line_parser.get_nonspace_quoted(field + strlen(field));
+ line_parser.get_nonspace_quoted(field + strlen(field), field_max - strlen(field));
}
while (field[0]) {
// print "field", "|";field;"|", "|";line_parser.string;"|", line_parser.pos
@@ -203,10 +203,10 @@ bool Allegro_reader::parse()
if (error_flag) {
field[0] = 0; // exit the loop
} else {
- line_parser.get_nonspace_quoted(field);
+ line_parser.get_nonspace_quoted(field, field_max);
pk = line_parser.peek();
if (pk && !isspace(pk)) {
- line_parser.get_nonspace_quoted(field + strlen(field));
+ line_parser.get_nonspace_quoted(field + strlen(field), field_max - strlen(field));
}
}
}
-12
View File
@@ -1,12 +0,0 @@
$NetBSD: patch-bd,v 1.2 2011/11/26 17:07:59 joerg Exp $
--- lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp.orig 2006-11-15 04:12:11.000000000 +0000
+++ lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp
@@ -50,6 +50,7 @@
#include <string>
#include <assert.h>
#include <limits.h>
+#include <string.h>
#include "WavFile.h"
@@ -0,0 +1,268 @@
$NetBSD: patch-lib-src_libnyquist_nyquist_ffts_src_fftlib.c,v 1.1 2015/04/27 23:50:39 joerg Exp $
--- lib-src/libnyquist/nyquist/ffts/src/fftlib.c.orig 2015-03-02 01:07:22.000000000 +0000
+++ lib-src/libnyquist/nyquist/ffts/src/fftlib.c
@@ -61,8 +61,8 @@ for (i1 = 0; i1 < Nroot_1; i1++){
parts of ffts1
*************************************************/
-inline void bitrevR2(float *ioptr, long M, short *BRLow);
-inline void bitrevR2(float *ioptr, long M, short *BRLow){
+void bitrevR2(float *ioptr, long M, short *BRLow);
+void bitrevR2(float *ioptr, long M, short *BRLow){
/*** bit reverse and first radix 2 stage of forward or inverse fft ***/
float f0r;
float f0i;
@@ -198,8 +198,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
};
}
-inline void fft2pt(float *ioptr);
-inline void fft2pt(float *ioptr){
+void fft2pt(float *ioptr);
+void fft2pt(float *ioptr){
/*** RADIX 2 fft ***/
float f0r, f0i, f1r, f1i;
float t0r, t0i;
@@ -229,8 +229,8 @@ ioptr[3] = f1i;
}
-inline void fft4pt(float *ioptr);
-inline void fft4pt(float *ioptr){
+void fft4pt(float *ioptr);
+void fft4pt(float *ioptr){
/*** RADIX 4 fft ***/
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
float t0r, t0i, t1r, t1i;
@@ -284,8 +284,8 @@ ioptr[6] = f3r;
ioptr[7] = f3i;
}
-inline void fft8pt(float *ioptr);
-inline void fft8pt(float *ioptr){
+void fft8pt(float *ioptr);
+void fft8pt(float *ioptr){
/*** RADIX 8 fft ***/
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
@@ -403,8 +403,8 @@ ioptr[14] = f6r;
ioptr[15] = f6i;
}
-inline void bfR2(float *ioptr, long M, long NDiffU);
-inline void bfR2(float *ioptr, long M, long NDiffU){
+void bfR2(float *ioptr, long M, long NDiffU);
+void bfR2(float *ioptr, long M, long NDiffU){
/*** 2nd radix 2 stage ***/
unsigned long pos;
unsigned long posi;
@@ -512,8 +512,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
}
}
-inline void bfR4(float *ioptr, long M, long NDiffU);
-inline void bfR4(float *ioptr, long M, long NDiffU){
+void bfR4(float *ioptr, long M, long NDiffU);
+void bfR4(float *ioptr, long M, long NDiffU){
/*** 1 radix 4 stage ***/
unsigned long pos;
unsigned long posi;
@@ -721,8 +721,8 @@ f4i = f4i * Two - f6i;
}
-inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
-inline void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
+void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
+void bfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
/*** RADIX 8 Stages ***/
unsigned long pos;
unsigned long posi;
@@ -1125,8 +1125,8 @@ default:
parts of iffts1
*************************************************/
-inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
-inline void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
+void scbitrevR2(float *ioptr, long M, short *BRLow, float scale);
+void scbitrevR2(float *ioptr, long M, short *BRLow, float scale){
/*** scaled bit reverse and first radix 2 stage forward or inverse fft ***/
float f0r;
float f0i;
@@ -1262,8 +1262,8 @@ for (; ioptr < iolimit; ioptr += POW2(M/
};
}
-inline void ifft2pt(float *ioptr, float scale);
-inline void ifft2pt(float *ioptr, float scale){
+void ifft2pt(float *ioptr, float scale);
+void ifft2pt(float *ioptr, float scale){
/*** RADIX 2 ifft ***/
float f0r, f0i, f1r, f1i;
float t0r, t0i;
@@ -1292,8 +1292,8 @@ ioptr[2] = scale*f1r;
ioptr[3] = scale*f1i;
}
-inline void ifft4pt(float *ioptr, float scale);
-inline void ifft4pt(float *ioptr, float scale){
+void ifft4pt(float *ioptr, float scale);
+void ifft4pt(float *ioptr, float scale){
/*** RADIX 4 ifft ***/
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
float t0r, t0i, t1r, t1i;
@@ -1347,8 +1347,8 @@ ioptr[6] = scale*f3r;
ioptr[7] = scale*f3i;
}
-inline void ifft8pt(float *ioptr, float scale);
-inline void ifft8pt(float *ioptr, float scale){
+void ifft8pt(float *ioptr, float scale);
+void ifft8pt(float *ioptr, float scale){
/*** RADIX 8 ifft ***/
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
@@ -1467,8 +1467,8 @@ ioptr[14] = scale*f6r;
ioptr[15] = scale*f6i;
}
-inline void ibfR2(float *ioptr, long M, long NDiffU);
-inline void ibfR2(float *ioptr, long M, long NDiffU){
+void ibfR2(float *ioptr, long M, long NDiffU);
+void ibfR2(float *ioptr, long M, long NDiffU){
/*** 2nd radix 2 stage ***/
unsigned long pos;
unsigned long posi;
@@ -1576,8 +1576,8 @@ for (SameUCnt = NSameU; SameUCnt > 0 ; S
}
}
-inline void ibfR4(float *ioptr, long M, long NDiffU);
-inline void ibfR4(float *ioptr, long M, long NDiffU){
+void ibfR4(float *ioptr, long M, long NDiffU);
+void ibfR4(float *ioptr, long M, long NDiffU){
/*** 1 radix 4 stage ***/
unsigned long pos;
unsigned long posi;
@@ -1785,8 +1785,8 @@ f4i = f4i * Two - f6i;
}
-inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
-inline void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
+void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt);
+void ibfstages(float *ioptr, long M, float *Utbl, long Ustride, long NDiffU, long StageCnt){
/*** RADIX 8 Stages ***/
unsigned long pos;
unsigned long posi;
@@ -2193,8 +2193,8 @@ default:
parts of rffts1
*************************************************/
-inline void rfft1pt(float *ioptr);
-inline void rfft1pt(float *ioptr){
+void rfft1pt(float *ioptr);
+void rfft1pt(float *ioptr){
/*** RADIX 2 rfft ***/
float f0r, f0i;
float t0r, t0i;
@@ -2212,8 +2212,8 @@ ioptr[0] = t0r;
ioptr[1] = t0i;
}
-inline void rfft2pt(float *ioptr);
-inline void rfft2pt(float *ioptr){
+void rfft2pt(float *ioptr);
+void rfft2pt(float *ioptr){
/*** RADIX 4 rfft ***/
float f0r, f0i, f1r, f1i;
float t0r, t0i;
@@ -2245,8 +2245,8 @@ ioptr[2] = f1r;
ioptr[3] = f1i;
}
-inline void rfft4pt(float *ioptr);
-inline void rfft4pt(float *ioptr){
+void rfft4pt(float *ioptr);
+void rfft4pt(float *ioptr){
/*** RADIX 8 rfft ***/
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
float t0r, t0i, t1r, t1i;
@@ -2318,8 +2318,8 @@ ioptr[6] = scale*f3r;
ioptr[7] = scale*f3i;
}
-inline void rfft8pt(float *ioptr);
-inline void rfft8pt(float *ioptr){
+void rfft8pt(float *ioptr);
+void rfft8pt(float *ioptr){
/*** RADIX 16 rfft ***/
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
float w1r = MYCOSPID8; /* cos(pi/8) */
@@ -2477,8 +2477,8 @@ ioptr[14] = scale*f6r;
ioptr[15] = scale*f6i;
}
-inline void frstage(float *ioptr, long M, float *Utbl);
-inline void frstage(float *ioptr, long M, float *Utbl){
+void frstage(float *ioptr, long M, float *Utbl);
+void frstage(float *ioptr, long M, float *Utbl){
/* Finish RFFT */
unsigned long pos;
@@ -2687,8 +2687,8 @@ default:
parts of riffts1
*************************************************/
-inline void rifft1pt(float *ioptr, float scale);
-inline void rifft1pt(float *ioptr, float scale){
+void rifft1pt(float *ioptr, float scale);
+void rifft1pt(float *ioptr, float scale){
/*** RADIX 2 rifft ***/
float f0r, f0i;
float t0r, t0i;
@@ -2706,8 +2706,8 @@ ioptr[0] = scale*t0r;
ioptr[1] = scale*t0i;
}
-inline void rifft2pt(float *ioptr, float scale);
-inline void rifft2pt(float *ioptr, float scale){
+void rifft2pt(float *ioptr, float scale);
+void rifft2pt(float *ioptr, float scale){
/*** RADIX 4 rifft ***/
float f0r, f0i, f1r, f1i;
float t0r, t0i;
@@ -2740,8 +2740,8 @@ ioptr[2] = scale*f1r;
ioptr[3] = scale*f1i;
}
-inline void rifft4pt(float *ioptr, float scale);
-inline void rifft4pt(float *ioptr, float scale){
+void rifft4pt(float *ioptr, float scale);
+void rifft4pt(float *ioptr, float scale){
/*** RADIX 8 rifft ***/
float f0r, f0i, f1r, f1i, f2r, f2i, f3r, f3i;
float t0r, t0i, t1r, t1i;
@@ -2811,8 +2811,8 @@ ioptr[6] = scale*f3r;
ioptr[7] = scale*f3i;
}
-inline void rifft8pt(float *ioptr, float scale);
-inline void rifft8pt(float *ioptr, float scale){
+void rifft8pt(float *ioptr, float scale);
+void rifft8pt(float *ioptr, float scale){
/*** RADIX 16 rifft ***/
float w0r = 1.0/MYROOT2; /* cos(pi/4) */
float w1r = MYCOSPID8; /* cos(pi/8) */
@@ -2968,8 +2968,8 @@ ioptr[14] = scale*f6r;
ioptr[15] = scale*f6i;
}
-inline void ifrstage(float *ioptr, long M, float *Utbl);
-inline void ifrstage(float *ioptr, long M, float *Utbl){
+void ifrstage(float *ioptr, long M, float *Utbl);
+void ifrstage(float *ioptr, long M, float *Utbl){
/* Start RIFFT */
unsigned long pos;
@@ -0,0 +1,15 @@
$NetBSD: patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c,v 1.1 2015/04/21 01:33:39 rodent Exp $
Fixes "error: invalid operands to binary" build failure.
--- lib-src/libnyquist/nyquist/nyqsrc/sndread.c.orig 2015-03-02 01:07:21.000000000 +0000
+++ lib-src/libnyquist/nyquist/nyqsrc/sndread.c
@@ -166,7 +166,7 @@ LVAL snd_make_read(
#ifdef XL_BIG_ENDIAN
long format = SF_ENDIAN_LITTLE;
#endif
- susp->sf_info.format |= format;
+ susp->sf_info.format |= (int) format;
}
susp->sndfile = sf_open((const char *) filename, SFM_READ,
@@ -0,0 +1,39 @@
$NetBSD: patch-lib-src_libnyquist_nyquist_sys_unix_switches.h,v 1.1 2015/04/21 01:33:39 rodent Exp $
Define endianness for {Free,Open,Net}BSD and Bitrig.
--- lib-src/libnyquist/nyquist/sys/unix/switches.h.orig 2015-03-02 01:07:23.000000000 +0000
+++ lib-src/libnyquist/nyquist/sys/unix/switches.h
@@ -89,6 +89,32 @@
/* Target processor is big endian. */
#define CPU_IS_BIG_ENDIAN 1
#endif
+ #elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/endian.h>
+ #if _BYTE_ORDER == _LITTLE_ENDIAN
+ /* Target processor is little endian. */
+ #define CPU_IS_LITTLE_ENDIAN 1
+ /* Target processor is big endian. */
+ #define CPU_IS_BIG_ENDIAN 0
+ #else
+ /* Target processor is little endian. */
+ #define CPU_IS_LITTLE_ENDIAN 0
+ /* Target processor is big endian. */
+ #define CPU_IS_BIG_ENDIAN 1
+ #endif
+ #elif defined(__OpenBSD__) || defined(__Bitrig__)
+ #include <endian.h>
+ #if BYTE_ORDER == _LITTLE_ENDIAN
+ /* Target processor is little endian. */
+ #define CPU_IS_LITTLE_ENDIAN 1
+ /* Target processor is big endian. */
+ #define CPU_IS_BIG_ENDIAN 0
+ #else
+ /* Target processor is little endian. */
+ #define CPU_IS_LITTLE_ENDIAN 0
+ /* Target processor is big endian. */
+ #define CPU_IS_BIG_ENDIAN 1
+ #endif
#else /* default is little endian */
/* Target processor is little endian. */
#define CPU_IS_LITTLE_ENDIAN 1
@@ -0,0 +1,16 @@
$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c,v 1.1 2015/04/21 01:33:39 rodent Exp $
Fix #error directive.
--- lib-src/libnyquist/nyquist/xlisp/xlfio.c.orig 2015-03-02 01:07:22.000000000 +0000
+++ lib-src/libnyquist/nyquist/xlisp/xlfio.c
@@ -19,8 +19,7 @@
/* do some sanity checking: */
#ifndef XL_BIG_ENDIAN
#ifndef XL_LITTLE_ENDIAN
-configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined
-in xlisp.h
+#error configuration error -- either XL_BIG_ or XL_LITTLE_ENDIAN must be defined in xlisp.h
#endif
#endif
#ifdef XL_BIG_ENDIAN
@@ -0,0 +1,27 @@
$NetBSD: patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h,v 1.1 2015/04/21 01:33:39 rodent Exp $
Define endianness for {Free,Open,Net}BSD and Bitrig.
--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig 2015-03-02 01:07:22.000000000 +0000
+++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
@@ -166,6 +166,20 @@ extern long ptrtoabs();
#else
#define XL_BIG_ENDIAN
#endif
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <sys/endian.h>
+ #if _BYTE_ORDER == _LITTLE_ENDIAN
+ #define XL_LITTLE_ENDIAN
+ #else
+ #define XL_BIG_ENDIAN
+ #endif
+#elif defined(__OpenBSD__) || defined(__Bitrig__)
+ #include <endian.h>
+ #if BYTE_ORDER == _LITTLE_ENDIAN
+ #define XL_LITTLE_ENDIAN
+ #else
+ #define XL_BIG_ENDIAN
+ #endif
#endif
/* Apple CC */
@@ -1,15 +0,0 @@
$NetBSD: patch-lib-src_soundtouch_source_SoundTouch_FIRFilter.cpp,v 1.1 2013/12/10 14:23:44 jperkin Exp $
Fix pow() argument types.
--- lib-src/soundtouch/source/SoundTouch/FIRFilter.cpp.orig 2006-11-15 04:12:11.000000000 +0000
+++ lib-src/soundtouch/source/SoundTouch/FIRFilter.cpp
@@ -177,7 +177,7 @@ void FIRFilter::setCoefficients(const SA
assert(length == newLength);
resultDivFactor = uResultDivFactor;
- resultDivider = (SAMPLETYPE)pow(2, resultDivFactor);
+ resultDivider = (SAMPLETYPE)pow(2, (double)resultDivFactor);
delete[] filterCoeffs;
filterCoeffs = new SAMPLETYPE[length];
@@ -1,13 +0,0 @@
$NetBSD: patch-lib-src_soundtouch_source_SoundTouch_Makefile.in,v 1.1 2013/10/28 23:43:03 joerg Exp $
--- lib-src/soundtouch/source/SoundTouch/Makefile.in.orig 2013-10-17 12:43:29.000000000 +0000
+++ lib-src/soundtouch/source/SoundTouch/Makefile.in
@@ -189,7 +189,7 @@ libSoundTouch_la_SOURCES = AAFilter.cpp
# ??? test for -fcheck-new in configure.ac
# other compiler flags to add
-AM_CXXFLAGS = -O3 -fcheck-new -I../../include
+AM_CXXFLAGS = -O3 -I../../include
all: all-am
.SUFFIXES:
@@ -1,13 +0,0 @@
$NetBSD: patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c,v 1.1 2012/02/15 20:01:54 hans Exp $
--- lib-src/portmixer/px_unix_oss/px_unix_oss.c.orig 2006-11-15 05:12:11.000000000 +0100
+++ lib-src/portmixer/px_unix_oss/px_unix_oss.c 2012-01-15 19:14:30.130748838 +0100
@@ -37,6 +37,8 @@
#ifdef __linux__
#include <linux/soundcard.h>
+#elif defined(__sun)
+#include <sys/soundcard.h>
#else
#include <machine/soundcard.h> /* JH20010905 */
#endif
@@ -1,13 +0,0 @@
--- src/AudioIO.cpp.orig 2006-11-15 05:12:10.000000000 +0100
+++ src/AudioIO.cpp 2012-01-15 19:16:58.001721823 +0100
@@ -25,6 +25,10 @@
#include <math.h>
#include <stdlib.h>
+#ifdef __sun
+#include <alloca.h>
+#endif
+
#ifdef __WXMSW__
#include <malloc.h>
#endif
@@ -1,6 +1,10 @@
--- src/effects/NoiseRemoval.cpp.orig 2006-11-15 05:12:10.000000000 +0100
+++ src/effects/NoiseRemoval.cpp 2012-01-15 19:19:20.622909031 +0100
@@ -16,6 +16,10 @@
$NetBSD: patch-src_effects_NoiseRemoval.cpp,v 1.2 2015/04/20 13:38:23 rodent Exp $
Fix build for SunOS.
--- src/effects/NoiseRemoval.cpp.orig 2015-03-02 01:06:57.000000000 +0000
+++ src/effects/NoiseRemoval.cpp
@@ -50,6 +50,10 @@
#include <math.h>
@@ -0,0 +1,18 @@
$NetBSD: patch-src_effects_VST_VSTEffect.cpp,v 1.1 2015/04/20 13:38:23 rodent Exp $
Some platforms don't have RTLD_DEEPBIND.
--- src/effects/VST/VSTEffect.cpp.orig 2015-03-02 01:06:58.000000000 +0000
+++ src/effects/VST/VSTEffect.cpp
@@ -2609,7 +2609,11 @@ bool VSTEffect::Load()
// symbols.
//
// Once we define a proper external API, the flags can be removed.
+# if defined(RTLD_DEEPBIND)
void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL | RTLD_DEEPBIND);
+# else
+ void *lib = dlopen((const char *)wxString(realPath).ToUTF8(), RTLD_NOW | RTLD_LOCAL);
+# endif
if (!lib)
{
return false;