Version bump.

7 files changed, 103 insertions, 30 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index ac23fc518f47..f8e6a6c7b4e9 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.91 2004/11/07 21:37:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.92 2004/11/12 10:58:15 eradicator Exp $
+
+*alsa-lib-1.0.7 (12 Nov 2004)
+
+  12 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/alsa-lib-1.0.3b-rate-capture.patch,
+  +files/alsa-lib-1.0.7-pcm_wait.patch, alsa-lib-1.0.6.ebuild,
+  +alsa-lib-1.0.7.ebuild:
+  Version bump.
 
   07 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-lib-1.0.6.ebuild:
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index cbfab9a5c415..d05cd75a1c62 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 72f7b5423da2a5d63db6c4673ff15aef alsa-lib-1.0.7.ebuild 1911
 MD5 c70aa2eafab8da5100e86a0245d253aa alsa-lib-0.9.8.ebuild 1584
 MD5 6b11458adc5a923dd38d150f500179a1 alsa-lib-1.0.2.ebuild 1609
-MD5 e43c316d024dedf2f4de7296d9065525 alsa-lib-1.0.6.ebuild 1911
+MD5 72f7b5423da2a5d63db6c4673ff15aef alsa-lib-1.0.6.ebuild 1911
 MD5 da7b73e5cce5af9fb86504ad43613f7d alsa-lib-1.0.5.ebuild 1734
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 6275ff345847ceae25f073f9a80a86ae ChangeLog 13661
 MD5 819916b5aecdc585b5add5d587bc8342 alsa-lib-1.0.5-r3.ebuild 1762
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
+MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
 MD5 5d0f60405a57450fdd98ceb5d4398056 files/digest-alsa-lib-1.0.6 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBjpXCArHZZzCEUG0RAkbtAJ9qkZ1ROrmeheVgh/G1H+hYDq/GWQCggTcq
-pmmbHIpzgQyZsIbIiinNSWw=
-=0aCk
------END PGP SIGNATURE-----
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
index b6ca0058ef6c..9c32283e065d 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild,v 1.7 2004/11/07 21:37:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.6.ebuild,v 1.8 2004/11/12 10:58:15 eradicator Exp $
 
 IUSE="static jack"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.alsa-project.org/"
 SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha amd64 -sparc ~ia64 ~ppc64 ~hppa ~mips"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc x86"
 LICENSE="GPL-2 LGPL-2.1"
 
 RDEPEND="virtual/alsa
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.7.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.7.ebuild
new file mode 100644
index 000000000000..148547a6b840
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.7.ebuild,v 1.1 2004/11/12 10:58:15 eradicator Exp $
+
+IUSE="static jack"
+
+inherit libtool eutils
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+LICENSE="GPL-2 LGPL-2.1"
+
+DEPEND="virtual/alsa
+	>=media-sound/alsa-headers-${PV}"
+
+PDEPEND="jack? ( =media-plugins/alsa-jack-${PV}* )"
+
+src_unpack() {
+	unpack ${A}
+
+	if use static; then
+		mv ${S} ${S}.static
+		unpack ${A}
+
+		cd ${S}.static
+		epatch ${FILESDIR}/${P}-pcm_wait.patch
+		elibtoolize
+	fi
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-pcm_wait.patch
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+
+	# needed to avoid gcc looping internaly
+	use hppa && export CFLAGS="-O1 -pipe"
+
+	econf --enable-static=no --enable-shared=yes || die
+	emake || die
+
+	# Can't do both according to alsa docs and bug #48233
+	if use static; then
+		cd ${S}.static
+		econf --enable-static=yes --enable-shared=no || die
+		emake || die
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	preserve_old_lib /usr/$(get_libdir)/libasound.so.1
+
+	dodoc ChangeLog COPYING TODO
+
+	if use static; then
+		cd ${S}.static
+		make DESTDIR="${D}" install || die "make install failed"
+	fi
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /usr/$(get_libdir)/libasound.so.1
+
+	einfo "If you are using an emu10k1 based sound card, and you are upgrading"
+	einfo "from a version of alsalib <1.0.6, you will need to recompile packages"
+	einfo "that link against alsa-lib due to some ABI changes between 1.0.5 and"
+	einfo "1.0.6 unique to that hardware. See the following URL for more information:"
+	einfo "http://bugs.gentoo.org/show_bug.cgi?id=65347"
+}
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
deleted file mode 100644
index c239fd828641..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.3b-rate-capture.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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/alsa-lib-1.0.7-pcm_wait.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.7-pcm_wait.patch
new file mode 100644
index 000000000000..997c7cec9ef4
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.7-pcm_wait.patch
@@ -0,0 +1,11 @@
+--- alsa-lib-1.0.6/src/pcm/pcm.c	2004-05-04 16:13:23.000000000 +0100
++++ alsa-lib-1.0.6.new/src/pcm/pcm.c	2004-11-11 23:46:13.318671120 +0000
+@@ -2091,7 +2091,7 @@
+ 		}
+ 	}
+ 	err = snd_pcm_poll_descriptors(pcm, &pfd, 1);
+-	assert(err == 1);
++	if (err <= 0) return err;
+       __retry:
+ 	err_poll = poll(&pfd, 1, timeout);
+ 	if (err_poll < 0)
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.7 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.7
new file mode 100644
index 000000000000..94bc82984498
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.7
@@ -0,0 +1 @@
+MD5 34ceaac0d1f0fc2b1462cef7c3a6825e alsa-lib-1.0.7.tar.bz2 676316