fixed alsa-1.0 compile bug, fixed jack dependency

5 files changed, 31 insertions, 10 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 1952ac10e826..f43e27dbcb0e 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.19 2003/12/13 07:10:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.20 2004/01/22 10:48:51 torbenh Exp $
+
+  22 Jan 2004; <torbenh@gentoo.org> alsaplayer-0.99.75-r1.ebuild,
+  alsaplayer-0.99.76.ebuild:
+  Fixed alsa-1.0 bug
+  fixed jack dependency.
 
   12 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org>
   alsaplayer-0.99.76.ebuild:
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index d9f66ca68d0e..d7ae0601ee04 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,6 +1,7 @@
-MD5 a64367a4916e1502df16ea753f1c25d0 ChangeLog 3796
-MD5 e114dfade5c4ed8d99d158dc72fa25b8 alsaplayer-0.99.76.ebuild 1453
-MD5 6aa47a95c905310a0e8f16feffff3b85 alsaplayer-0.99.75-r1.ebuild 2097
+MD5 ef8edc5de79b80cb9b8e2c8fd9ff1648 ChangeLog 3936
+MD5 5c748e3711ed038b770d7570eadeca80 alsaplayer-0.99.76.ebuild 1475
+MD5 3be4f6e757e3057184136a002b0165f9 metadata.xml 221
+MD5 61ab657995b67a4d172a8cda64f5496f alsaplayer-0.99.75-r1.ebuild 2250
 MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76 71
 MD5 d7c5048a47693b7a9ba603a3fadd8cd1 files/digest-alsaplayer-0.99.75-r1 71
 MD5 5c35a3140250067b9e24fea110bde6c4 files/gcc.patch 805
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
index 63f2afb3cc4c..32ff1a50b21c 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild,v 1.2 2003/12/10 20:01:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild,v 1.3 2004/01/22 10:48:51 torbenh Exp $
 
 IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa"
 
@@ -13,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
 
-DEPEND="alsa? ( media-libs/alsa-lib )
+DEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
 	doc? ( app-doc/doxygen )
 	esd? ( media-sound/esound )
 	gtk? ( x11-libs/gtk+ )
@@ -25,6 +25,13 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i "/#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)/s/SND_LIB_MAJOR>0 ||//" configure
+}
+
 src_compile() {
 	epatch ${FILESDIR}/gcc.patch
 
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
index 6be62be30dd8..310be873ce2f 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.2 2003/12/13 07:10:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.3 2004/01/22 10:48:51 torbenh Exp $
 
 IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa jack mikmod flac"
 
@@ -19,8 +19,8 @@ DEPEND=">=dev-libs/glib-1.2.10
 	gtk? ( x11-libs/gtk+ )
 	nas? ( media-libs/nas )
 	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
 	flac? ( media-libs/flac )
-	jack? ( media-libs/libjackasyn )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	opengl? ( virtual/opengl )
 	oggvorbis? ( media-libs/libvorbis )"
diff --git a/media-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
new file mode 100644
index 000000000000..d4ce46c038ab
--- /dev/null
+++ b/media-sound/alsaplayer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+<maintainer>
+  <email>torbenh@gentoo.org</email>
+</maintainer>
+</pkgmetadata>