diff options
author | rillig <rillig@pkgsrc.org> | 2007-02-23 03:37:55 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2007-02-23 03:37:55 +0000 |
commit | 0cf50a81b4998e4bbda177e03de1e57cc3fd81d0 (patch) | |
tree | e796420e6a8ee8b2a06977c2cf54aa0002da3636 | |
parent | 65ace24e1ffd4f0231c3ed40925094560624d3c5 (diff) | |
download | pkgsrc-0cf50a81b4998e4bbda177e03de1e57cc3fd81d0.tar.gz |
The rest of the update. Now pkglint is happy, too.
-rw-r--r-- | audio/audacity/distinfo | 6 | ||||
-rw-r--r-- | audio/audacity/patches/patch-af | 11 | ||||
-rw-r--r-- | audio/audacity/patches/patch-ak | 13 | ||||
-rw-r--r-- | audio/audacity/patches/patch-al | 13 |
4 files changed, 31 insertions, 12 deletions
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo index 6831bd73d6b..87b6dfed4f1 100644 --- a/audio/audacity/distinfo +++ b/audio/audacity/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2007/02/23 03:27:40 rillig Exp $ +$NetBSD: distinfo,v 1.16 2007/02/23 03:37:55 rillig Exp $ SHA1 (audacity-src-1.2.6.tar.gz) = 1bfdd119fdc09d1aa334aee21d4831ef6e939fce RMD160 (audacity-src-1.2.6.tar.gz) = f59ca075ae430a518b77ce2ed08441abe2b67a0c @@ -8,8 +8,10 @@ SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d SHA1 (patch-ac) = 00698c284e513e20f28ac536b206139ad87ab6d2 SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046 SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4 -SHA1 (patch-af) = 65b23fef2d842f4b9a1bef2723f4c020e2e0dcee +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 diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af index 33287e47abe..43ce849bb92 100644 --- a/audio/audacity/patches/patch-af +++ b/audio/audacity/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.5 2007/02/23 03:27:41 rillig Exp $ +$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 @@ -103,12 +103,3 @@ are C++. use_precomp="no" -@@ -7518,6 +7597,8 @@ do - _ACEOF - cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ : Avoid regenerating within pkgsrc -+ exit 0 - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; diff --git a/audio/audacity/patches/patch-ak b/audio/audacity/patches/patch-ak new file mode 100644 index 00000000000..94ebeb83a16 --- /dev/null +++ b/audio/audacity/patches/patch-ak @@ -0,0 +1,13 @@ +$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
diff --git a/audio/audacity/patches/patch-al b/audio/audacity/patches/patch-al new file mode 100644 index 00000000000..10a72045868 --- /dev/null +++ b/audio/audacity/patches/patch-al @@ -0,0 +1,13 @@ +$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
|