backport a fix from upstream for vamp-plugin-sdk 2 compatibility

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28 x86_64

4 files changed, 68 insertions, 4 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 01695e086145..8fa9dc740736 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.112 2009/01/09 22:22:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.113 2009/01/15 08:06:35 aballier Exp $
+
+  15 Jan 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.6-vamp2.patch, audacity-1.3.6.ebuild:
+  backport a fix from upstream for vamp-plugin-sdk 2 compatibility
 
   09 Jan 2009; Joseph Jezak <josejx@gentoo.org> audacity-1.3.6.ebuild:
   Marked ~ppc for bug #244360.
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 5dea8d6cbf5c..56b8dabf1a49 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2007-6061.patch 990 RMD160 65c960ffbad4ed21b56064fc44672da15a3a9a84 SHA1 4519a1b819feb77d6d49e22db1699dbad14a73f3 SHA256 45ef372a604d900ff9f40e7070525506fe63073cc4dd4edaf0fe7078d37df24d
 AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44f95c08b SHA1 908aba3830560e16678a35d9350e2f681c452bf9 SHA256 a992234a9219c266a4318ba0cfd23404d11dd0b1ebce587512996cdbc8fd4946
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
@@ -5,6 +8,7 @@ AUX audacity-1.3.5-cflags_with_non_standard_macros.patch 1579 RMD160 a199800aacd
 AUX audacity-1.3.5-libtool22.patch 621 RMD160 9c8b46928a8dd2d1750163570fa9a36abb44212a SHA1 c1fb708d251331670a881bb3196baf21bfc5bee7 SHA256 c8f25696de80da8f41224be44c630c288e7a94290bb0d86fef6709e0d1923f67
 AUX audacity-1.3.5-novorbis.patch 484 RMD160 cc6416c4ae82d557dc33291911b9826a13313881 SHA1 93c336118eb29eeb09175574f6ef37006f620869 SHA256 34045eb10d9f2d724c4f9c8ed8f33fc57354f73a10531713f9fdff40269f7cb1
 AUX audacity-1.3.6-novorbis.patch 469 RMD160 d7fec0a0447821c6f1d755341b35e1574cff376a SHA1 5a0cc57de7b244d8d66127743e43cee53f5ffb02 SHA256 c00b173468876b4ad077c463a88391e9f82f44b4cc842d82a08234a46b3e7091
+AUX audacity-1.3.6-vamp2.patch 1641 RMD160 41ef74687eb8f40e6f4e0e0155952ea5d9e9adcd SHA1 b7428af98b92849e5f01b1a5abcab6caf71d7342 SHA256 896f38734de75da53e314a4e7487c7f133697b83a29c5e3c742e0ece48a3f44c
 DIST audacity-1.3.4-portaudio-cvs-rev1.7.patch.bz2 6235 RMD160 38e74622e7af4cf3662e87256ec38373eeb00595 SHA1 0a19a1e38d7ee552d75583a6e99e892b3cf4ab50 SHA256 ad78193aee772eb78e5a315d721b0f35242eb6f9b5e8f7d9e718d8a11e70b8a1
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
 DIST audacity-src-1.3.5.tar.bz2 4542637 RMD160 f4d56d8ad88ad743c9ae04ee4abc3ded61674c5e SHA1 6ff24769fdef7bb0db7702eecb128f242fc85fce SHA256 58beaf20d5d4bdec61c93cc9bda08faea9b1c9b51c962b4176e9390a6a65904c
@@ -13,6 +17,13 @@ DIST pa_stable_v19_20071207.tar.gz 1113282 RMD160 5185bd85bd4bc75dddb3fa56f172a3
 EBUILD audacity-1.3.4-r3.ebuild 2954 RMD160 7d16f63e00fc0bc7d9155cdb77bcf5077a8893df SHA1 17c20c4ce1b6dc01148f5e3817421d41b6753fd3 SHA256 e6882880a70b72def3c0c8cccca19e752b49977a9be30a810b0d9b2282ff126a
 EBUILD audacity-1.3.5-r1.ebuild 2505 RMD160 ac191f01c4b976130d75068fe0c3e5aba40c3592 SHA1 877eede92a28ad4cc9dbae4733074990d35de94d SHA256 f8cd44cf94e8fac202b0cb75fd1f0943e4fe7e90f16864daca432ccd07b05e19
 EBUILD audacity-1.3.5.ebuild 2763 RMD160 758954ce92206219a781c9f35248668ec9095c7e SHA1 f607c2e1927526620ef4838863d2e1e1cef1798b SHA256 2cb9ce81ad5f8e898d872a96c0d93583b09c18df50f696765315f07613ca2fb5
-EBUILD audacity-1.3.6.ebuild 2710 RMD160 e655643bed93fa19e5436b2f1fd76bf36021c6b5 SHA1 e0ce609e65f372635a1437c9cba871055446e756 SHA256 3df4028a55003f9549d172f7167feb470592766557610b08d81807174a591ddb
-MISC ChangeLog 19173 RMD160 60222d5e30490e4f4dd4b39b79476bde806e9b65 SHA1 e6050dd8dbcaacca0aace3c1d8bc2b95587e2f4e SHA256 a46d10de75f1850d39f92facffa2fa38927a518a8873221c49e4f8e85a860d60
+EBUILD audacity-1.3.6.ebuild 2801 RMD160 745720f4a72ed48e49e44ff7b6c1a21e26ab124c SHA1 954a97e7ec846710a958583aeaabee3ae0d675e1 SHA256 0f580156872275d6908175577c890defe6b00bda4c96ad2b9a486857ed0331bb
+MISC ChangeLog 19355 RMD160 fb8498f073da7d99dde9bb60ffdda525247ec341 SHA1 56a2436ad80ed52910aeeed8772d91132eeca656 SHA256 289f4400a125f80551f64e0a26912bee484fe0267f01583e5c861982dc500158
 MISC metadata.xml 540 RMD160 af87bf45a5fe6c0b9e0622ca574374e63f0f54bc SHA1 0b9aae054070ae3e941b2ddbae5af137de16fdfa SHA256 5dfbf5b22fd3e3fd53714334381588f02e5776b98e07abc1fdbd7ad14fc07486
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklu7pEACgkQvFcC4BYPU0piegCcDRzqtbZ6hI68b3p0AYs181PN
+dUMAn1jnvtdgPiXS9mrJgkHhP8TFzLeO
+=Sqb5
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.6.ebuild b/media-sound/audacity/audacity-1.3.6.ebuild
index b18fd5b25632..45c935ac8177 100644
--- a/media-sound/audacity/audacity-1.3.6.ebuild
+++ b/media-sound/audacity/audacity-1.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.6.ebuild,v 1.4 2009/01/09 22:22:04 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.6.ebuild,v 1.5 2009/01/15 08:06:35 aballier Exp $
 
 EAPI=2
 
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.3.4-automagic.patch"
 	epatch "${FILESDIR}/${PN}-1.3.5-libtool22.patch"
 	epatch "${FILESDIR}/${P}-novorbis.patch"
+	has_version '>=media-libs/vamp-plugin-sdk-2.0' && epatch "${FILESDIR}/${P}-vamp2.patch"
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-sound/audacity/files/audacity-1.3.6-vamp2.patch b/media-sound/audacity/files/audacity-1.3.6-vamp2.patch
new file mode 100644
index 000000000000..91ebcf35efd8
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.6-vamp2.patch
@@ -0,0 +1,48 @@
+Index: src/effects/vamp/VampEffect.cpp
+===================================================================
+RCS file: /cvsroot/audacity/audacity-src/src/effects/vamp/VampEffect.cpp,v
+retrieving revision 1.8
+retrieving revision 1.10
+diff -u -B -r1.8 -r1.10
+--- src/effects/vamp/VampEffect.cpp	12 Jul 2008 15:25:49 -0000	1.8
++++ src/effects/vamp/VampEffect.cpp	30 Dec 2008 00:36:55 -0000	1.10
+@@ -13,15 +13,9 @@
+ 
+ #include "VampEffect.h"
+ 
+-#ifdef _WIN32
+-#include "../../../lib-src/libvamp/vamp-sdk/Plugin.h"
+-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginChannelAdapter.h"
+-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginInputDomainAdapter.h"
+-#else
+-#include <vamp-sdk/Plugin.h>
+-#include <vamp-sdk/hostext/PluginChannelAdapter.h>
+-#include <vamp-sdk/hostext/PluginInputDomainAdapter.h>
+-#endif
++#include <vamp-hostsdk/Plugin.h>
++#include <vamp-hostsdk/PluginChannelAdapter.h>
++#include <vamp-hostsdk/PluginInputDomainAdapter.h>
+ 
+ #include <wx/wxprec.h>
+ #include <wx/button.h>
+Index: src/effects/vamp/VampEffect.h
+===================================================================
+RCS file: /cvsroot/audacity/audacity-src/src/effects/vamp/VampEffect.h,v
+retrieving revision 1.5
+retrieving revision 1.7
+diff -u -B -r1.5 -r1.7
+--- src/effects/vamp/VampEffect.h	12 Jul 2008 15:25:49 -0000	1.5
++++ src/effects/vamp/VampEffect.h	30 Dec 2008 00:36:55 -0000	1.7
+@@ -22,11 +22,7 @@
+ 
+ #include <wx/dialog.h>
+ 
+-#ifdef _WIN32
+-#include "../../../lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h"
+-#else
+-#include <vamp-sdk/hostext/PluginLoader.h>
+-#endif
++#include <vamp-hostsdk/PluginLoader.h>
+ 
+ void LoadVampPlugins();
+