Adding patch to compile with alsa-1.0. Closes 35266

5 files changed, 40 insertions, 10 deletions

diff --git a/media-plugins/alsa-xmms/ChangeLog b/media-plugins/alsa-xmms/ChangeLog
index 6d180cd71ef0..caf2a9455790 100644
--- a/media-plugins/alsa-xmms/ChangeLog
+++ b/media-plugins/alsa-xmms/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/alsa-xmms
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-xmms/ChangeLog,v 1.11 2003/12/06 23:34:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-xmms/ChangeLog,v 1.12 2004/01/03 12:58:08 mholzer Exp $
+
+  03 Jan 2004; Martin Holzer <mholzer@gentoo.org> alsa-xmms-0.9.12.ebuild,
+  files/alsa-xmms-alsa.patch:
+  Adding patch to compile with alsa-1.0. Closes 35266
 
   07 Dec 2003; Heinrich Wendel <lanius@gentoo.org> alsa-xmms-0.9.12.ebuild:
   ~ppc > ppc
diff --git a/media-plugins/alsa-xmms/Manifest b/media-plugins/alsa-xmms/Manifest
index ecab2b136321..4a2ea7d47bde 100644
--- a/media-plugins/alsa-xmms/Manifest
+++ b/media-plugins/alsa-xmms/Manifest
@@ -1,16 +1,17 @@
-MD5 3a7cb08cb13a3debc3db66d06dfad6eb alsa-xmms-0.9.12.ebuild 716
+MD5 596e1e2455919a654a1e177428b4b696 ChangeLog 2633
+MD5 130ec516c2091cee48f12681e4d61369 alsa-xmms-0.9.10.ebuild 743
+MD5 bccbe27b9807e6f1828ad2f26c9f3d39 alsa-xmms-0.9.11.ebuild 719
+MD5 4bce736e97f7adfed88a51f697228b7c alsa-xmms-0.9.12.ebuild 794
 MD5 363e4b3968548e7692e0b75ef4ff7e51 alsa-xmms-0.9.5.ebuild 823
+MD5 5d1a18cf1bf504090995b1d28db6b54a alsa-xmms-0.9.6b.ebuild 742
 MD5 26dc586d38619df1017b33ce606a8382 alsa-xmms-0.9.7.ebuild 741
-MD5 bccbe27b9807e6f1828ad2f26c9f3d39 alsa-xmms-0.9.11.ebuild 719
 MD5 f0dda2db5a24e56ae04cda2743e3ae9d alsa-xmms-0.9.9b.ebuild 742
-MD5 05bae9cd3d553143be564efc67937ae2 ChangeLog 2472
-MD5 5d1a18cf1bf504090995b1d28db6b54a alsa-xmms-0.9.6b.ebuild 742
-MD5 130ec516c2091cee48f12681e4d61369 alsa-xmms-0.9.10.ebuild 743
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 MD5 5331896fcb645b14b9b8a67ff863db51 files/digest-alsa-xmms-0.9.10 68
 MD5 c9d0b090c03227dfedf7e0351f7968b3 files/digest-alsa-xmms-0.9.11 68
 MD5 8110642da36bf76e5515f39ac9a84720 files/digest-alsa-xmms-0.9.12 68
-MD5 25b34263547866e82c1acff8f39551ee files/digest-alsa-xmms-0.9.6b 68
-MD5 9df222aaaf9a3135162b724d0037f997 files/digest-alsa-xmms-0.9.9b 68
 MD5 45beb94f3d8a9929310e3521d17cd3e4 files/digest-alsa-xmms-0.9.5 67
+MD5 25b34263547866e82c1acff8f39551ee files/digest-alsa-xmms-0.9.6b 68
 MD5 042b378e99f0c322e9431c2d111469cb files/digest-alsa-xmms-0.9.7 67
+MD5 9df222aaaf9a3135162b724d0037f997 files/digest-alsa-xmms-0.9.9b 68
+MD5 2809a4cfcac80b411662f887cf1847c6 files/alsa-xmms-alsa.patch 408
diff --git a/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild b/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild
index d69bbfa0608b..a71fdd04be56 100644
--- a/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild
+++ b/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild,v 1.5 2003/12/06 23:34:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-xmms/alsa-xmms-0.9.12.ebuild,v 1.6 2004/01/03 12:58:08 mholzer Exp $
 
 DESCRIPTION="XMMS output plugin for ALSA 0.9*.  Supports surround 4.0 output with conversion."
 HOMEPAGE="http://savannah.gnu.org/download/alsa-xmms/"
@@ -16,6 +16,12 @@ SLOT="0"
 SRC_URI="http://savannah.gnu.org/download/${PN}/${P}.tar.gz"
 S=${WORKDIR}/${P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-alsa.patch
+}
+
 src_install() {
 	einstall \
 		libdir=${D}/usr/lib/xmms/Output || die
diff --git a/media-plugins/alsa-xmms/files/alsa-xmms-alsa.patch b/media-plugins/alsa-xmms/files/alsa-xmms-alsa.patch
new file mode 100644
index 000000000000..a576235f0a20
--- /dev/null
+++ b/media-plugins/alsa-xmms/files/alsa-xmms-alsa.patch
@@ -0,0 +1,15 @@
+diff -ur src/alsa.h.org src/alsa.h
+--- src/alsa.h.org	2003-07-10 18:55:23.000000000 -0500
++++ src/alsa.h	2003-12-07 18:04:52.616425896 -0600
+@@ -38,6 +38,11 @@
+ #include <xmms/plugin.h>
+ #include <xmms/configfile.h>
+ 
++#include <alsa/version.h>
++#if SND_LIB_MAJOR==1
++#define ALSA_PCM_OLD_HW_PARAMS_API
++#define ALSA_PCM_NEW_HW_PARAMS_API
++#endif
+ #include <alsa/asoundlib.h>
+ #include <alsa/pcm_plugin.h>
+ 
diff --git a/media-plugins/alsa-xmms/metadata.xml b/media-plugins/alsa-xmms/metadata.xml
index e1774e3d9ad7..78ec7f6984fe 100644
--- a/media-plugins/alsa-xmms/metadata.xml
+++ b/media-plugins/alsa-xmms/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<maintainer>
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound Team</name>
+</maintainer>
 </pkgmetadata>