Patch closes bug #42087.

4 files changed, 29 insertions, 7 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 31351503b410..118fd15f0287 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.40 2004/03/10 02:43:00 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.41 2004/03/14 23:38:31 eradicator Exp $
+
+  14 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-tools-1.0.3.ebuild, files/alsa-tools-1.0.3-kernel-2.6.patch:
+  Patch closes bug #42087.
 
   09 Mar 2004; Tom Gall <tgall@gentoo.org> 
   alsa-tools-1.0.0_rc2-r1.ebuild, alsa-tools-1.0.1.ebuild, 
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 8bdcc7525dd5..a2e8cdde2fde 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,16 +1,17 @@
-MD5 5508dd6ad6068f3eee1cc2d638652bd2 ChangeLog 6163
 MD5 b735f161a72d041d9eea71d3b6ef8c73 alsa-tools-0.9.0_rc1-r1.ebuild 1601
 MD5 2942f447ec5f5cd807e823b195eef96d alsa-tools-0.9.1.ebuild 1577
+MD5 972f331ced2b413d671b05d6b95e0e98 alsa-tools-1.0.3.ebuild 2355
 MD5 19f798fb5c496d07007c9922d0db2c6e alsa-tools-0.9.8.ebuild 2119
 MD5 fed32b6fc182a19366097cd7e566423c alsa-tools-1.0.0_rc2-r1.ebuild 2289
-MD5 a4de9a3c7268e939285b3c5b2af8089a alsa-tools-1.0.1.ebuild 2277
 MD5 c144ad0f4a4bd920d4e8887dee3388dc alsa-tools-1.0.2.ebuild 2277
-MD5 7e9eed65485687cc32ccb1d2e7591e9a alsa-tools-1.0.3.ebuild 2277
+MD5 766934e1a39e186b33549ec8c9bf35d0 ChangeLog 6321
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
+MD5 a4de9a3c7268e939285b3c5b2af8089a alsa-tools-1.0.1.ebuild 2277
+MD5 898810373b49d9d25e9e19006bf9903f files/alsa-tools-1.0.3-kernel-2.6.patch 443
 MD5 0c34b1352e030b5ef4d8ae5e102a8c3d files/digest-alsa-tools-0.9.1 69
 MD5 1671d48040628fff2ae90826203f01ec files/digest-alsa-tools-0.9.8 70
-MD5 a5ef60aa30a10ede88f0da93c6fead4a files/digest-alsa-tools-1.0.0_rc2-r1 72
 MD5 0e89f5d12874ba0ccaa60db2e44c27ee files/digest-alsa-tools-1.0.1 69
 MD5 483effb0ad68356ad0b27560efd9e908 files/digest-alsa-tools-1.0.2 69
 MD5 0d9226e726980c37ecbe4ca0ab3fb23e files/digest-alsa-tools-1.0.3 69
+MD5 a5ef60aa30a10ede88f0da93c6fead4a files/digest-alsa-tools-1.0.0_rc2-r1 72
+MD5 2094cef02e54ae2c227bf442fa461f08 files/digest-alsa-tools-0.9.0_rc1-r1 72
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
index b44d3ca9bda6..d7281a98be87 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild,v 1.2 2004/03/10 02:43:00 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.3.ebuild,v 1.3 2004/03/14 23:38:31 eradicator Exp $
 
 IUSE=""
 
@@ -45,6 +45,11 @@ ALSA_TOOLS="ac3dec as10k1 envy24control hdspconf hdsploader hdspmixer \
 # hdsploader
 # sscape_ctl
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-kernel-2.6.patch
+}
+
 src_compile() {
 	# hdspmixer requires fltk
 	export LDFLAGS="-L/usr/lib/fltk-1.1"
diff --git a/media-sound/alsa-tools/files/alsa-tools-1.0.3-kernel-2.6.patch b/media-sound/alsa-tools/files/alsa-tools-1.0.3-kernel-2.6.patch
new file mode 100644
index 000000000000..c4be92e77802
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.0.3-kernel-2.6.patch
@@ -0,0 +1,12 @@
+diff -Naur alsa-tools-1.0.3-old/seq/sbiload/sbiload.c alsa-tools-1.0.3/seq/sbiload/sbiload.c
+--- alsa-tools-1.0.3-old/seq/sbiload/sbiload.c	2003-07-30 10:14:21.000000000 -0400
++++ alsa-tools-1.0.3/seq/sbiload/sbiload.c	2004-03-13 21:07:28.611732988 -0500
+@@ -20,7 +20,7 @@
+ 
+ #include <errno.h>
+ #include <getopt.h>
+-#include <sound/ainstr_fm.h>
++#include <alsa/sound/ainstr_fm.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>