diff options
author | rodent <rodent> | 2015-04-21 01:33:38 +0000 |
---|---|---|
committer | rodent <rodent> | 2015-04-21 01:33:38 +0000 |
commit | 0d8b00ce73bb5ddc13d069122921b1ab577e5cc0 (patch) | |
tree | 4ba4480107ddd8e86126379bb7a1ed657412b1bc /audio | |
parent | f209275327510fb7c191793eaaa1e505a72a8d95 (diff) | |
download | pkgsrc-0d8b00ce73bb5ddc13d069122921b1ab577e5cc0.tar.gz |
Fix nyquist support (at least for {Free,Open,Net}BSD and Bitrig.
Diffstat (limited to 'audio')
6 files changed, 104 insertions, 3 deletions
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index ad067020ff7..719981c152e 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2015/04/20 13:38:23 rodent Exp $ +# $NetBSD: Makefile,v 1.90 2015/04/21 01:33:38 rodent Exp $ DISTNAME= audacity-minsrc-2.1.0 PKGNAME= ${DISTNAME:S/-minsrc//1} @@ -23,7 +23,7 @@ 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=no --without-midi # both are BROKEN +CONFIGURE_ARGS+= --enable-nyquist=yes --without-midi # portsmf is BROKEN CONFIG_GUESS_OVERRIDE= \ config.guess */config.guess */*/config.guess */*/*/config.guess diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index 42fb074df6b..593d9ae744d 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2015/04/20 13:38:23 rodent Exp $ +$NetBSD: distinfo,v 1.25 2015/04/21 01:33:38 rodent Exp $ SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3 RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f @@ -8,5 +8,9 @@ SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96 SHA1 (patch-ba) = 4fca5002ba31e9831f7f7447ac909bd865543f76 SHA1 (patch-bb) = 29dfe1333ac6428d9b3d40a54a996b12d8766932 SHA1 (patch-bc) = a19ccf7e7ae048f430d59e1fc17bc9e8ff80b0da +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 diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c new file mode 100644 index 00000000000..d23f5435fbe --- /dev/null +++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c @@ -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, diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_sys_unix_switches.h b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_sys_unix_switches.h new file mode 100644 index 00000000000..ab9ea1c6d90 --- /dev/null +++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_sys_unix_switches.h @@ -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 diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c new file mode 100644 index 00000000000..313ea774975 --- /dev/null +++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c @@ -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 diff --git a/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h new file mode 100644 index 00000000000..48386673ee7 --- /dev/null +++ b/audio/audacity/patches/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h @@ -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 */ |