diff options
| -rw-r--r-- | media-sound/audacity/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/audacity/audacity-1.3.6.ebuild | 3 | ||||
| -rw-r--r-- | media-sound/audacity/files/audacity-1.3.6-vamp2.patch | 48 |
3 files changed, 55 insertions, 2 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/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(); + |