Including patch submitted in bug #45612 to fix alsa+dmix+artsd.

5 files changed, 40 insertions, 27 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 388f0549a571..c70850761fb4 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.57 2004/03/20 09:21:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.58 2004/03/24 18:18:08 eradicator Exp $
+
+*alsa-lib-1.0.3b-r2 (24 Mar 2004)
+
+  24 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-lib-1.0.3b-r2.ebuild, alsa-lib-1.0.3b.ebuild:
+  Including patch submitted in bug #45612 to fix alsa+dmix+artsd.
 
   20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  alsa-lib-0.9.8.ebuild:
+  alsa-lib-0.9.8.ebuild, files/alsa-lib-1.0.3b-rate-capture.patch:
   RDEPEND fix for bug #44816.
 
 *alsa-lib-1.0.3b-r1 (14 Mar 2004)
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index b02cc97eed12..ce6485fcfcbc 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -3,17 +3,19 @@ MD5 81de5d6acaaabfba855da4ff2bedacd0 alsa-lib-1.0.0_rc2-r1.ebuild 1806
 MD5 93b4167f66ab9c80d6db15ed0faae8b6 alsa-lib-0.9.8.ebuild 1597
 MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
 MD5 75df5b1b2764c1728a43db782123b38a alsa-lib-1.0.2.ebuild 1616
+MD5 835ef265e78730801f31d63657839026 alsa-lib-1.0.3b-r2.ebuild 1332
 MD5 aa121973afeb12465c8ca0e5771985f6 alsa-lib-0.9.7.ebuild 1104
 MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
-MD5 b0be58d32a8d9daf905608a8450dec78 alsa-lib-1.0.3b.ebuild 1536
-MD5 c20d92e54d2f72a95cef93832a4f93d9 ChangeLog 8339
+MD5 f3ec5093ba532d0df935075dac4546ef ChangeLog 8593
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 9927b59da455a39a882c18891136e346 alsa-lib-1.0.1.ebuild 1800
 MD5 76500cdb32cd661c3963e50029d17704 alsa-lib-1.0.3b-r1.ebuild 1314
 MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
+MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 9070048b85478705fe11a7938a70c419 files/digest-alsa-lib-0.9.0_rc2 70
 MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r1 68
+MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r2 68
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch 1788
 MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.1-notextrel-notrampoline.patch 1788
@@ -24,4 +26,3 @@ MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 62c198849d6ef20d1add476b1d3eeb2a files/digest-alsa-lib-1.0.1 67
 MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
 MD5 d85563e2d37f36cd69695715c46faee3 files/digest-alsa-lib-1.0.0_rc2-r1 70
-MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b 68
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.3b.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild
index 8e925969f2f0..417885ceb4da 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.3b.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.3b.ebuild,v 1.1 2004/03/13 21:33:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.3b-r2.ebuild,v 1.1 2004/03/24 18:18:08 eradicator Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Advanced Linux Sound Architecture Library"
 HOMEPAGE="http://www.alsa-project.org/"
@@ -13,10 +13,10 @@ LICENSE="GPL-2 LGPL-2.1"
 
 IUSE="jack"
 
-DEPEND="virtual/glibc
-	>=sys-devel/automake-1.7.2
-	>=sys-devel/autoconf-2.57-r1
-	!ppc? ( jack? ( virtual/jack ) )"
+DEPEND=">=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1"
+
+PDEPEND="!ppc? ( jack? ( =media-plugins/alsa-jack-${PV}* ) )"
 
 MY_P=${P/_rc/rc}
 #SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
@@ -24,16 +24,12 @@ SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
 RESTRICT="nomirror"
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	elibtoolize
-	econf || die "./configure failed"
-	emake || die "make failed"
-
-	if [ -n "`use jack`" ]
-	then
-		cd ${S}/src/pcm/ext
-		make jack || die "make on jack plugin failed"
-	fi
+
+	cd ${S}/src/pcm
+	epatch ${FILESDIR}/${P}-rate-capture.patch
 }
 
 src_install() {
@@ -43,14 +39,8 @@ src_install() {
 	#Without this library just about everything even remotely
 	#linked to previous versions of alsa-lib will break.
 	#Fortunately, libasound.so.2 seems to be backwards
-	#compatible with libasound.so.2 and a simple link
+	#compatible with libasound.so.1 and a simple link
 	#fixes the problem (fingers crossed)
 	dosym /usr/lib/libasound.so.2 /usr/lib/libasound.so.1
 	dodoc ChangeLog COPYING TODO
-
-	if [ -n "`use jack`" ]
-	then
-		cd ${S}/src/pcm/ext
-		make DESTDIR=${D} install-jack || die "make install on jack plugin failed"
-	fi
 }
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.3b-rate-capture.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.3b-rate-capture.patch
new file mode 100644
index 000000000000..c239fd828641
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.3b-rate-capture.patch
@@ -0,0 +1,16 @@
+Index: pcm_rate.c
+===================================================================
+RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_rate.c,v
+retrieving revision 1.81
+diff -u -r1.81 pcm_rate.c
+--- pcm_rate.c	17 Mar 2004 11:48:15 -0000	1.81
++++ pcm_rate.c	23 Mar 2004 14:36:54 -0000
+@@ -1079,6 +1079,8 @@
+ 	      __partial:
+ 		xfer = 0;
+ 		cont = rate->slave->buffer_size - slave_offset;
++		if (cont > rate->slave->period_size)
++			cont = rate->slave->period_size;
+ 		snd_pcm_areas_copy(rate->sareas, 0,
+ 				   slave_areas, slave_offset,
+ 				   pcm->channels, cont,
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r2
index bb6690901875..bb6690901875 100644
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.3b-r2