summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-03-14 23:38:31 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-03-14 23:38:31 +0000
commite07aba338f772340e1c7740895bebf08777d8dbc (patch)
tree4793c561f59871602dbd68e2b558897aba4b5201 /media-sound/alsa-tools
parent (Manifest recommit) (diff)
downloadgentoo-2-e07aba338f772340e1c7740895bebf08777d8dbc.tar.gz
gentoo-2-e07aba338f772340e1c7740895bebf08777d8dbc.tar.bz2
gentoo-2-e07aba338f772340e1c7740895bebf08777d8dbc.zip
Patch closes bug #42087.
Diffstat (limited to 'media-sound/alsa-tools')
-rw-r--r--media-sound/alsa-tools/ChangeLog6
-rw-r--r--media-sound/alsa-tools/alsa-tools-1.0.3.ebuild7
-rw-r--r--media-sound/alsa-tools/files/alsa-tools-1.0.3-kernel-2.6.patch12
3 files changed, 23 insertions, 2 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/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>