Fix compile errors for use with Audacious 2.2_alpha1

(Portage version: 2.1.6.13/cvs/Linux i686)

4 files changed, 136 insertions, 9 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/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>