Added patch to fix segfaulting using alsa-lib-1.0.9_rc2 and in-kernel (2.6.11) drivers.

(Portage version: 2.0.51.19)

5 files changed, 26 insertions, 14 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 2907dfa04a24..961644fe2744 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.111 2005/03/31 03:40:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.112 2005/04/06 10:29:56 eradicator Exp $
+
+*alsa-lib-1.0.9_rc2-r1 (06 Apr 2005)
+
+  06 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/alsa-lib-1.0.9_rc2-87099.patch, -alsa-lib-1.0.9_rc2.ebuild,
+  +alsa-lib-1.0.9_rc2-r1.ebuild:
+  Added patch to fix segfaulting using alsa-lib-1.0.9_rc2 and in-kernel
+  (2.6.11) drivers.
 
 *alsa-lib-1.0.9_rc2 (31 Mar 2005)
 
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 578f0097c722..81a9fd676b49 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 976d924f65f9ef46a14845214be70e65 ChangeLog 16527
 MD5 5659184e067dbf68af9e9251837332c5 alsa-lib-0.9.8.ebuild 1584
 MD5 c840b6d57683f228d3db41a4091e78a5 alsa-lib-1.0.2.ebuild 1609
-MD5 7e79bdef5865d306f23435fab1b59318 alsa-lib-1.0.9_rc2.ebuild 1736
+MD5 1940f4f02a3116c8b660f741fec19a59 alsa-lib-1.0.9_rc2-r1.ebuild 1773
 MD5 255565a888541274148ccb6e1b226eb5 alsa-lib-1.0.7.ebuild 2051
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 680dd86b81d67ef8decb1da4d0071d09 alsa-lib-1.0.8.ebuild 1585
@@ -12,16 +9,10 @@ MD5 ff6b3f2ba9f419d2e31c55f93da0e170 files/alsa-lib-1.0.7-pcm_wait.patch 342
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
-MD5 1b33c494753d830e707e63fbb025a9b1 files/digest-alsa-lib-1.0.9_rc2 70
+MD5 1b33c494753d830e707e63fbb025a9b1 files/digest-alsa-lib-1.0.9_rc2-r1 70
 MD5 b3c7b1ce898095f9c9d069175c3a8338 files/alsa-lib-1.0.9_rc2-gcc4.patch 1335
 MD5 86565eb0601b611f39adb8f5ad47b622 files/digest-alsa-lib-1.0.7 67
 MD5 46a389b403bc763310e942cc9fc6d7b1 files/digest-alsa-lib-1.0.8 67
 MD5 d832d735aa8fa9959ff66276eb648cef files/alsa-lib-1.0.8-gcc4.patch 1656
 MD5 afc44aabeb36448990c19eaa9b3dfce0 files/alsa-lib-mixer.patch 264
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCUX5zArHZZzCEUG0RArNsAJ9lTwcOv4Bbjh7uIZapasMweW19agCfWPQi
-7LbEr1y6k/JyPH6Ck0xfH2o=
-=/nKt
------END PGP SIGNATURE-----
+MD5 05a7e64e1e5c447436f1c518cc176dd6 files/alsa-lib-1.0.9_rc2-87099.patch 629
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.9_rc2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.9_rc2-r1.ebuild
index 2885c6a34a4f..cd8ebc099c7a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.9_rc2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.9_rc2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.9_rc2.ebuild,v 1.2 2005/04/04 17:49:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.9_rc2-r1.ebuild,v 1.1 2005/04/06 10:29:56 eradicator Exp $
 
 IUSE="jack doc"
 
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-87099.patch
 }
 
 src_compile() {
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.9_rc2-87099.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.9_rc2-87099.patch
new file mode 100644
index 000000000000..7a81ba2ad6c3
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.9_rc2-87099.patch
@@ -0,0 +1,12 @@
+diff -urN alsa-lib-1.0.9rc2/src/pcm/pcm_direct.c alsa-lib-1.0.9rc1/src/pcm/pcm_direct.c
+--- alsa-lib-1.0.9rc2/src/pcm/pcm_direct.c	2005-03-15 12:39:51.000000000 +0100
++++ alsa-lib-1.0.9rc1/src/pcm/pcm_direct.c	2005-01-19 14:43:25.000000000 +0100
+@@ -848,7 +840,7 @@
+ 				snd_pcm_info_get_card(info),
+ 				snd_pcm_info_get_device(info),
+ 				snd_pcm_info_get_subdevice(info) * 2 + capture);
+-	ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD);
++	ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK);
+ 	if (ret < 0) {
+ 		SNDERR("unable to open timer '%s'", name);
+ 		return ret;
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.9_rc2 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.9_rc2-r1
index 774aa7a0a95b..774aa7a0a95b 100644
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.9_rc2
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.9_rc2-r1