Fix compile errors for use with Audacious 2.2_alpha1

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 140 insertions, 12 deletions

diff --git a/media-libs/freeverb3/ChangeLog b/media-libs/freeverb3/ChangeLog
index b4eda790be1e..187ce7c57200 100644
--- a/media-libs/freeverb3/ChangeLog
+++ b/media-libs/freeverb3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freeverb3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/ChangeLog,v 1.2 2009/05/17 17:29:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/ChangeLog,v 1.3 2009/10/03 03:18:59 sping Exp $
+
+  03 Oct 2009; Sebastian Pipping <sping@gentoo.org> freeverb3-2.3.1.ebuild,
+  +files/freeverb3-2.3.1-plugin-api-v8-v10.patch, metadata.xml:
+  Fix compile errors for use with Audacious 2.2_alpha1, un-proxy me :-)
 
 *freeverb3-2.3.1 (17 May 2009)
 
diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 842d8d1f9167..9977c0c1098f 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,7 +1,8 @@
 AUX freeverb3-2.3.0-fix-implicit.patch 2824 RMD160 06ec53065b435e7461cdbb84bc38fe813637742f SHA1 fa393a906f46f06fcbc918793160c170afe34de4 SHA256 f0bef314d3b171ea8d13d98bff78648780337f72f07f2161f2c453a78805f13e
+AUX freeverb3-2.3.1-plugin-api-v8-v10.patch 3693 RMD160 91b47d826b659bfc38706f537611ad5e7e0d6a6b SHA1 68a3ba9a3cf481de4970fd961e475ca31d8b0571 SHA256 3425d9419743f227d3ff44f1dedec104b9c2a8c719b0360f0b0404f17c472df5
 DIST freeverb3-2.3.0.tar.gz 6105716 RMD160 9bf057e76d28e535242da3b72e2fb5f787adf142 SHA1 dfcd3fe7b7ad5ef469afee6f55a44632c3e6a2c3 SHA256 be47a53554fbe176cf32023ab7245e2d6b6a12ec514742cb0bc64c1dcd0b576b
 DIST freeverb3-2.3.1.tar.gz 6107465 RMD160 5fdd160d349439598e91da73c7bf638c39560c1c SHA1 f0c43b8a16a2793dac774ca727ec1a146143e199 SHA256 f93b225b9be565134e495ca07720e78011aff8fe3d1f9050839af265020dc983
 EBUILD freeverb3-2.3.0.ebuild 1163 RMD160 0500974f0e5e3ab3cddb63e8ea7502af5828c365 SHA1 5a73504a7b7057302a6578f76bed1797855ced8c SHA256 46730806311a28ee694362aa63af380f64cb7b11be63d897a646ae214f04ee88
-EBUILD freeverb3-2.3.1.ebuild 1098 RMD160 206cc72554a3b4bd3096ba1ded0304c4ed989f68 SHA1 b339ef79d89f423bb2bbe8b45948df66baec48c1 SHA256 e1eeea9a0eac3a3703a35993e985c0a257cdb9b81f3cbbb8dad7992b336a32d2
-MISC ChangeLog 648 RMD160 929202310a48c94c03cd14b621644658298a99aa SHA1 9040b850f5e5145417ab034de11f52e9fccc377d SHA256 0641bba5fa0dba0a063c187f9c0c33bd29b88a4c4ee6b5a8352794f915a28662
-MISC metadata.xml 668 RMD160 9b0645b3dae56ef90aa0e9f2777e4ef3492a67cb SHA1 7cad03b271ef52607339d0cc4185fefd77b78863 SHA256 d5281fdb6c4f1b559e57dcf1b3f9a9a76a01cb23d9007ef674fa6096b5873d7a
+EBUILD freeverb3-2.3.1.ebuild 1174 RMD160 e2ba219968d2dd7741dd8dac9b2e2a78870e12f3 SHA1 a5a7e3d2a59783143d8b719790952b8c6ee7d3de SHA256 e6b4004a64bdc991a23a86cb9bf36052dcae538b8f9be87c756c72fcca3e901d
+MISC ChangeLog 860 RMD160 3b42b76f450fa1920e99266f7eaab41270096ec5 SHA1 b6497bba467b14073d567efdfd71a2529cdbf7d0 SHA256 19649d66f02ced1cd348d01fe967b13cd45f89ce06fda4ed2de2bbf655f67fec
+MISC metadata.xml 472 RMD160 88f81b230341ec0e0afd0f189fbf806ea2d7e0bd SHA1 c4762417e86a8192b4941596b2274c373a0b554e SHA256 e9c13a5ded6fe3d338338d5484f6896bf36d3b051081b3031f2a529431a0e431
diff --git a/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch b/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch
new file mode 100644
index 000000000000..5bc6c8f328b9
--- /dev/null
+++ b/media-libs/freeverb3/files/freeverb3-2.3.1-plugin-api-v8-v10.patch
@@ -0,0 +1,125 @@
+From a5dbe75a4b2c26ff969ef0b8eb2acc0b39f477a7 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 3 Oct 2009 04:57:55 +0200
+Subject: [PATCH] Support Plugin API v8, v10 and later
+
+---
+ work/freeverb3-2.3.1/xmms/compressor.cpp |   12 ++++++++++++
+ work/freeverb3-2.3.1/xmms/filter.cpp     |    3 +++
+ work/freeverb3-2.3.1/xmms/freeverb3.cpp  |    3 +++
+ work/freeverb3-2.3.1/xmms/impulser.cpp   |    3 +++
+ work/freeverb3-2.3.1/xmms/impulser2.cpp  |    3 +++
+ work/freeverb3-2.3.1/xmms/revmodel.cpp   |    3 +++
+ work/freeverb3-2.3.1/xmms/stenh.cpp      |    3 +++
+ 7 files changed, 30 insertions(+), 0 deletions(-)
+
+diff --git a/work/freeverb3-2.3.1/xmms/compressor.cpp b/work/freeverb3-2.3.1/xmms/compressor.cpp
+index a02570f..a18eca3 100644
+--- a/work/freeverb3-2.3.1/xmms/compressor.cpp
++++ b/work/freeverb3-2.3.1/xmms/compressor.cpp
+@@ -1095,6 +1095,18 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++/*
++ * Compile fix for Audacious 2.2_alpha1
++ *
++ * Increase PAPI version.
++ * http://hg.atheme.org/audacious/annotate/74969c017b3e/src/audacious/plugin.h#64
++ *
++ * Shuffle some functors and fields around in plugin structures; Start of cleanup.
++ * http://hg.atheme.org/audacious/annotate/8554b25b0087/src/audacious/plugin.h#1025
++ */
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/filter.cpp b/work/freeverb3-2.3.1/xmms/filter.cpp
+index 3b01e4d..b403124 100644
+--- a/work/freeverb3-2.3.1/xmms/filter.cpp
++++ b/work/freeverb3-2.3.1/xmms/filter.cpp
+@@ -462,6 +462,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/freeverb3.cpp b/work/freeverb3-2.3.1/xmms/freeverb3.cpp
+index f00bc8e..8bda2be 100644
+--- a/work/freeverb3-2.3.1/xmms/freeverb3.cpp
++++ b/work/freeverb3-2.3.1/xmms/freeverb3.cpp
+@@ -700,6 +700,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/impulser.cpp b/work/freeverb3-2.3.1/xmms/impulser.cpp
+index c1b6856..6341219 100644
+--- a/work/freeverb3-2.3.1/xmms/impulser.cpp
++++ b/work/freeverb3-2.3.1/xmms/impulser.cpp
+@@ -617,6 +617,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/impulser2.cpp b/work/freeverb3-2.3.1/xmms/impulser2.cpp
+index cf8e453..1385484 100644
+--- a/work/freeverb3-2.3.1/xmms/impulser2.cpp
++++ b/work/freeverb3-2.3.1/xmms/impulser2.cpp
+@@ -1538,6 +1538,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/revmodel.cpp b/work/freeverb3-2.3.1/xmms/revmodel.cpp
+index d596df4..bc808ae 100644
+--- a/work/freeverb3-2.3.1/xmms/revmodel.cpp
++++ b/work/freeverb3-2.3.1/xmms/revmodel.cpp
+@@ -592,6 +592,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+diff --git a/work/freeverb3-2.3.1/xmms/stenh.cpp b/work/freeverb3-2.3.1/xmms/stenh.cpp
+index 3eca478..d376896 100644
+--- a/work/freeverb3-2.3.1/xmms/stenh.cpp
++++ b/work/freeverb3-2.3.1/xmms/stenh.cpp
+@@ -905,6 +905,9 @@ static EffectPlugin epe = {
+   cleanup,
+   about,
+   configure,
++#if __AUDACIOUS_PLUGIN_API__ >= 10
++  NULL,
++#endif
+   FALSE,
+   mod_samples,
+   NULL,
+-- 
+1.6.4.4
+
diff --git a/media-libs/freeverb3/freeverb3-2.3.1.ebuild b/media-libs/freeverb3/freeverb3-2.3.1.ebuild
index 340ea885de13..e25c1063fc65 100644
--- a/media-libs/freeverb3/freeverb3-2.3.1.ebuild
+++ b/media-libs/freeverb3/freeverb3-2.3.1.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-libs/freeverb3/freeverb3-2.3.1.ebuild,v 1.1 2009/05/17 17:29:41 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeverb3/freeverb3-2.3.1.ebuild,v 1.2 2009/10/03 03:18:59 sping Exp $
 
 EAPI=2
 inherit eutils
@@ -21,6 +21,10 @@ RDEPEND=">=sci-libs/fftw-3.0.1
 		media-libs/libsndfile )"
 DEPEND=${RDEPEND}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.3.1-plugin-api-v8-v10.patch
+}
+
 src_configure() {
 	econf \
 		--enable-release \
diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml
index acee2e162e78..5251146e238d 100644
--- a/media-libs/freeverb3/metadata.xml
+++ b/media-libs/freeverb3/metadata.xml
@@ -3,14 +3,8 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<maintainer>
-		<email>yngwin@gentoo.org</email>
-		<name>Ben de Groot</name>
-		<description>Proxy maintainer</description>
-	</maintainer>
-	<maintainer>
-		<email>webmaster@hartwork.org</email>
+		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
-		<description>The proxied maintainer</description>
 	</maintainer>
 	<use>
 		<flag name='audacious'>Build Audacious plugin</flag>