From bbf621821ccede5cfece57c91c73076909f30e68 Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 15 Feb 2012 20:01:54 +0000 Subject: Fix build on SunOS. --- audio/audacity/Makefile | 4 ++-- audio/audacity/distinfo | 7 +++++-- audio/audacity/patches/patch-ac | 4 ++-- .../patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c | 13 +++++++++++++ audio/audacity/patches/patch-src_AudioIO.cpp | 13 +++++++++++++ audio/audacity/patches/patch-src_effects_NoiseRemoval.cpp | 13 +++++++++++++ 6 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 audio/audacity/patches/patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c create mode 100644 audio/audacity/patches/patch-src_AudioIO.cpp create mode 100644 audio/audacity/patches/patch-src_effects_NoiseRemoval.cpp (limited to 'audio/audacity') diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index 82f8282c8cd..d044f3d3939 100644 --- a/audio/audacity/Makefile +++ b/audio/audacity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2012/02/06 12:39:19 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2012/02/15 20:01:54 hans Exp $ DISTNAME= audacity-src-1.2.6 PKGREVISION= 12 @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes +USE_PKGLOCALEDIR= no USE_TOOLS+= autoconf gmake msgfmt pkg-config zip:run USE_LANGUAGES= c c++ GNU_CONFIGURE= yes diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index dc24f22b700..fc08f71e1b5 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.20 2011/11/26 17:07:59 joerg Exp $ +$NetBSD: distinfo,v 1.21 2012/02/15 20:01:54 hans 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) = 00698c284e513e20f28ac536b206139ad87ab6d2 +SHA1 (patch-ac) = 2baaf1650c9bdc627000e8676f0ac6ec16b6ec26 SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046 SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4 SHA1 (patch-af) = 05c1c345ef9b92410fbe4d8b4b46ab4b7ba7a226 @@ -20,3 +20,6 @@ SHA1 (patch-ba) = c27676c7110bf6ef2fcd448d68402b7bfd21b631 SHA1 (patch-bb) = 050c6edc0a174e2496ef0b572002eca185bd38de SHA1 (patch-bc) = 8a08526c37e025a89a747fa2c7a48668fe797572 SHA1 (patch-bd) = dc24c670cdf078f08c29318c5c5dc8efed398f59 +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 diff --git a/audio/audacity/patches/patch-ac b/audio/audacity/patches/patch-ac index 8ebfd73827d..eab37f59f56 100644 --- a/audio/audacity/patches/patch-ac +++ b/audio/audacity/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2005/10/03 20:42:59 joerg Exp $ +$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 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.3 2005/10/03 20:42:59 joerg Exp $ #include "sndirix.h" -#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) ++#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) || defined(__sun) #include "sndfreebsd.h" #elif defined(_WIN32) diff --git a/audio/audacity/patches/patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c b/audio/audacity/patches/patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c new file mode 100644 index 00000000000..e75a611278a --- /dev/null +++ b/audio/audacity/patches/patch-lib_src_portmixer_px__unix__oss_px__unix__oss.c @@ -0,0 +1,13 @@ +$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 ++#elif defined(__sun) ++#include + #else + #include /* JH20010905 */ + #endif diff --git a/audio/audacity/patches/patch-src_AudioIO.cpp b/audio/audacity/patches/patch-src_AudioIO.cpp new file mode 100644 index 00000000000..4ddcba3f247 --- /dev/null +++ b/audio/audacity/patches/patch-src_AudioIO.cpp @@ -0,0 +1,13 @@ +--- 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 + #include + ++#ifdef __sun ++#include ++#endif ++ + #ifdef __WXMSW__ + #include + #endif diff --git a/audio/audacity/patches/patch-src_effects_NoiseRemoval.cpp b/audio/audacity/patches/patch-src_effects_NoiseRemoval.cpp new file mode 100644 index 00000000000..1bd82e779b0 --- /dev/null +++ b/audio/audacity/patches/patch-src_effects_NoiseRemoval.cpp @@ -0,0 +1,13 @@ +--- 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 @@ + + #include + ++#ifdef __sun ++#include ++#endif ++ + #if defined(__WXMSW__) && !defined(__CYGWIN__) + #include + #define finite(x) _finite(x) -- cgit v1.2.3