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

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0x401A1600

4 files changed, 58 insertions, 9 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/Manifest b/media-libs/freeverb3/Manifest
index 765077807e7d..f6610e5db8ae 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -6,18 +6,19 @@ AUX freeverb3-2.3.1-plugin-api-v8-v10.patch 3693 SHA256 3425d9419743f227d3ff44f1
 AUX freeverb3-2.5.0-pow-ambiguity.patch 585 SHA256 c00c3568a4ed00ba9f39a3bd15a9b3422c10d87d437d48721fd719b68d3cde52 SHA512 745054e06e89cfb29aadd3475fd510062c933c5592758d943cbb15996f98a804b61aa4388ba6ca26f5803e5793a5baadfb70b6cf4312268b8afc57f7d5bff8e4 WHIRLPOOL f440b0b6830d28cbe9f3534c5f0f68d511ccd8c5a3197ce1906666088b75b6c6f2e448f3bdb3738a56ecf7342c965f2ae64b56deab59e3fbe8380437c93f5865
 AUX freeverb3-2.5.13-fix-sse1v2-assembly.patch 665 SHA256 46454f15b01089545c4198a0b022d98c45b030403aaf919c8615079e8f9df74b SHA512 399057ae770c6e4021798f94c26fd67ff0051913e964de5a542027d97d4a7c91826d413238526543b3e235a35bd6472e1c587b001c4a86cb01cc307fefb6f07d WHIRLPOOL 4496758073753be63ddb17561a197bdca0de35c429f2bc2a774e7aec6a4fbfc9993e436b55e068382496af132f74cf6b18bd50cdbb592a65a79fbffe8e06ac1b
 AUX freeverb3-2.5.13-respect-disable-sse.patch 577 SHA256 38b55b97866b52534c641e90cce199a9a02176df7b590004b862149e530de4a7 SHA512 df84a29b8ebe1f60008c4657e0ddf04047ab51dd336d5f1b29942f6f19e2e7496458a101f5a195fbe91e2b39870eeb5fdd40b8bbf1b2e27bddba9f196a748409 WHIRLPOOL 5095197f72720d244b3b9823d0850af608855657f9b8ad0c43dc750880cb1d9d92ec8e3f5fd3039c1f8d94d0e3e06b84a0dc1622a2115819a19f717563a6021e
+AUX freeverb3-3.0.0-audacious-3.3.x.patch 1432 SHA256 4f865961f10b1f8b5cd5f21f7e6423688a64ef5e48f88fdec4ab121341061e17 SHA512 4c2ccfc147fa676a6050ccef4dee3e9ff9bfc433e585297b8bedd90c5612e308a6ae1c3d1a5b063013afdaa14abd4e547ea16f418ce12b78883ad294bd33bec2 WHIRLPOOL bdf1e0cfa73e8db9be32d37b219ffec7d90b8afa31feedee02933e36600fc6465ca163f75f9e52329ad6d61a7b3427c23539d8dc2070c49b4611350197123edb
 DIST freeverb3-2.5.13.tar.gz 6143981 SHA256 9c29adc15a94e6140e52f0b1a5a60923a8e9a3beb21ada4182363c60b25126dd
 DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4
 DIST freeverb3-3.0.0.tar.gz 6199391 SHA256 32b65eaf5aee89443f9313241480f93a419cddb0325201538cc930b80a4631be SHA512 22eea4fac0e8c5e32cec4d4f7ed2f7f98c2c78fdff8f7b22e218f089072d6711455e546ad89763b0c2fe733d1f0656fe9a3080b70cb873cbea8030a87d360378 WHIRLPOOL 8da252e6edb2546baf27331abcdc55c195bfea5cd2bad0bcaa4fdfd00c34de24ce3c632461acaca14b49273f11103c5b975e7b9f18f321b567561a2d0eb39ad6
 EBUILD freeverb3-2.5.13-r2.ebuild 1567 SHA256 3e37fd9e643b99352cc5517a6a5ef0d50baab9c68e94423a1e3bb54ba1b0ec3b SHA512 daacd8cc01bf90680123ee0fa2bcf313f4ee76addbcfb8076d4912fc3cdcc980d6352d8cccc9a6f9aa91f543db0ed41038632bc067889c6e5b6d43730283eea2 WHIRLPOOL 7a53346a7110836fc6ef454935b80e68ea2e0932e28bf369640cb14d78793fee37dcbfb126ffa877d7fb4aa13580f45d0273adc0a8539007b365ae71f4147ccb
 EBUILD freeverb3-2.6.6.ebuild 1622 SHA256 1c826c9dcfb2a32fae5c6124d16a48fae0f5101f2b16910c5ee31e3cdb226e14 SHA512 7ef84daf7fdbb05bd1ef8f30d7cbdeff180f47df0b8b50d6eaa4de2f29dbc21fd9a36349194a7e9353506f516f31391eafa32ff054a25d6281c56475939a0955 WHIRLPOOL 523364af49d13910b138f76fb90d60789c53d74f5a808a8a8b3c87284a42910ac5456019f78d0bb96754725a1170ae7b664d011f447a84a3017efd2d818a58b2
-EBUILD freeverb3-3.0.0.ebuild 1958 SHA256 d6a71dd657d8f2d45cc8e8ffef62fb533b74c309c6bf704245960e60f26409ad SHA512 9d5d06763262730948297f7f03fda7fc8a53ed4dd66d3fb2ffa881eedbe08dd710f95da5894377ec7bbedf2d6b6f2d0a7d99cca07bad131f67c392a8e679c9fb WHIRLPOOL 1e4662c65b0c60adc2205ba2b2438c0f2f344f6f8fa1b56ea17af5c077a0cb61ae979bfda5d4dbf5065a1f7ebbfb2467082fff0a47ff1dda026ca01f8ac9f470
-MISC ChangeLog 7097 SHA256 b483dd602357597c89a8c1c67bb9b1d9db6f902c63585fa69604bc77b9db2873 SHA512 7107dd7bf0229db7a869b1c60419101a9757dff518a4c55fa7ce3c42ea7072fba3ab41b066e61cb973684f40e0fda4a181bd64128fa825c21e31fe7ff23bd9a0 WHIRLPOOL 00bf27e2e64beb5a9c6d5db34d0d98e9cd8c62b8104b453ea6cd2422abcad0988a72bbf438b7f3907c36aa408737c137a620ee3ff40d9cf590820a5e334fdb9c
+EBUILD freeverb3-3.0.0.ebuild 2011 SHA256 65ff7843a7379e60c4c61354f394fe5604786f8667db3981e73026c781b2645e SHA512 37d0d2b431f9d3ad2ad0781bc353fe8f6359eea83d1d5f85e20f471c249bf3b39f0d7984b43319c299945c2d671c10dec026f27dc161c5e43e741d4a60a2b373 WHIRLPOOL cf29074c8c02279ed5d135d752207774383b7536e270bdbda22b9d50a1dd1998361ad9ecdf04bb4a5234c3d3b548fb14b3c9b2236a9c307410c72ceac950f64b
+MISC ChangeLog 7277 SHA256 12dba8617c18ee0c5c252f28b90350abc9703cc316df5867ac8b7f4eb64a6dbb SHA512 fdfe9cefcce2afd576e91868de7b5a4704d672436f251239d75f7433f7d5c6e3fdf490f8dabc508dafa27ea923451f09994702299c20fd971e50f86a8381639f WHIRLPOOL f4ba8b097f128b8bd5f24248037c20aefe0d14fcf53ae02dfde22cf9fcb41ea0cd85f59b79d44ba0b1409351dfd45d4cbf511174f295ca4fb3269b532e506c41
 MISC metadata.xml 649 SHA256 e9a505b92928a87ea73c6cfa4a325493766d16a981115453407aea0fd306db96 SHA512 058fa3fdc8492e02d64a1bce611b8a6272eff6574c1cd45237da9ca965ecbf60cea0f4f6428e94bdd0f104b375cca9eaa5b0deebe372922786f8805cf840a64d WHIRLPOOL 71f9b5e87b243033b130dee4ab0a1d1beacbe0a7747d0dd500db57f7a91ffff5b83fa382957a92dcc0cfad5b17486043a851a224d257675eb6c405ea6dcaf138
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGrsCUACgkQsAvGakAaFgD6/wCgiV8wsHtxxnTK+7q9OxLtQOje
-KFEAoIJodGYIrP+k6VLytnX/QHgDa3kS
-=mshT
+iEYEAREIAAYFAlGzH/gACgkQsAvGakAaFgCjCgCfdq6MUlJKyJ/MC4LhHAy+9vjw
+uO8AoIuJMfXFmpk4r6GfT8+aV0RcnjtY
+=cQJI
 -----END PGP SIGNATURE-----
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 \