media-libs/freeverb3-3.0.0: Audacious 3.3.x support

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 0x401A1600)

3 files changed, 52 insertions, 4 deletions

diff --git a/media-libs/freeverb3/ChangeLog b/media-libs/freeverb3/ChangeLog
index cf4b20fff1fb..63aa2f19a33a 100644
--- a/media-libs/freeverb3/ChangeLog
+++ b/media-libs/freeverb3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeverb3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/ChangeLog,v 1.38 2013/06/02 20:50:06 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/ChangeLog,v 1.39 2013/06/08 12:13:06 sping Exp $
+
+  08 Jun 2013; Sebastian Pipping <sping@gentoo.org> freeverb3-3.0.0.ebuild,
+  +files/freeverb3-3.0.0-audacious-3.3.x.patch:
+  Make Audacious plugin work with Audacious 3.3.x, too
 
   02 Jun 2013; Sebastian Pipping <sping@gentoo.org> freeverb3-3.0.0.ebuild:
   Turn >=3.1 into >3.1 for dependency on Audacious
diff --git a/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch b/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch
new file mode 100644
index 000000000000..9e343c0b0838
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-3.0.0-audacious-3.3.x.patch
@@ -0,0 +1,40 @@
+From 43416e5d5ce5d13f81e1cd0f69da7ff0351f6d65 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Jun 2013 14:00:33 +0200
+Subject: [PATCH] Make Audacious plugin work with Audacious 3.3.x, too
+
+---
+ audacious/so.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/audacious/so.c b/audacious/so.c
+index 8c679df..37aa056 100644
+--- a/audacious/so.c
++++ b/audacious/so.c
+@@ -44,8 +44,12 @@ static void dsp_start(gint * channels, gint * rate){ if(ptable != NULL) ptable->
+ static void dsp_process(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->process(data,samples); }
+ static void dsp_flush(){ if(ptable != NULL) ptable->flush(); }
+ static void dsp_finish(gfloat ** data, gint * samples){ if(ptable != NULL) ptable->finish(data,samples); }
++#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40)
+ static gint decoder_to_output_time(gint time){ return time; }
+ static gint output_to_decoder_time(gint time){ return time; }
++#else
++static int adjust_delay(int delay){ return delay; }
++#endif
+ 
+ AUD_EFFECT_PLUGIN
+ (
+@@ -57,6 +61,10 @@ AUD_EFFECT_PLUGIN
+  .start = dsp_start,
+  .process = dsp_process,
+  .finish = dsp_finish,
++#if defined(_AUD_PLUGIN_VERSION_MIN) && (_AUD_PLUGIN_VERSION_MIN < 40)
+  .decoder_to_output_time = decoder_to_output_time,
+  .output_to_decoder_time = output_to_decoder_time,
++#else
++ .adjust_delay = adjust_delay,
++#endif
+  )
+-- 
+1.8.2.1
+
diff --git a/media-libs/freeverb3/freeverb3-3.0.0.ebuild b/media-libs/freeverb3/freeverb3-3.0.0.ebuild
index cc92be2f6a2b..3abb3e409320 100644
--- a/media-libs/freeverb3/freeverb3-3.0.0.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.0.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-3.0.0.ebuild,v 1.2 2013/06/02 20:50:06 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-3.0.0.ebuild,v 1.3 2013/06/08 12:13:06 sping Exp $
 
 EAPI=2
-inherit multilib versionator
+inherit eutils multilib versionator
 
 DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins"
 HOMEPAGE="http://freeverb3.sourceforge.net/"
@@ -21,7 +21,7 @@ _GTK_DEPEND=">=dev-libs/glib-2.4.7:2
 	x11-libs/cairo"
 
 RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? ( >media-sound/audacious-3.1 !>=media-sound/audacious-3.3
+	audacious? ( >media-sound/audacious-3.1
 		${_GTK_DEPEND}
 		media-libs/libsndfile )
 	jack? ( media-sound/jack-audio-connection-kit
@@ -31,6 +31,10 @@ DEPEND=${RDEPEND}
 
 S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0.0-audacious-3.3.x.patch
+}
+
 src_configure() {
 	econf \
         --disable-profile \