summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-02-18 23:37:27 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-02-18 23:37:27 +0000
commitab71d03f164778ae9d1e030620f51afcf640fcff (patch)
treedb8d633c77062425efdc91437bb36e08a88e86dd /media-sound/alsa-driver
parentVersion bump. (diff)
downloadgentoo-2-ab71d03f164778ae9d1e030620f51afcf640fcff.tar.gz
gentoo-2-ab71d03f164778ae9d1e030620f51afcf640fcff.tar.bz2
gentoo-2-ab71d03f164778ae9d1e030620f51afcf640fcff.zip
added patch which were contribution by Søren Dalby Larsen <sdl@larsen.dk>. fixes #81666
(Portage version: 2.0.51.16)
Diffstat (limited to 'media-sound/alsa-driver')
-rw-r--r--media-sound/alsa-driver/ChangeLog7
-rw-r--r--media-sound/alsa-driver/alsa-driver-1.0.8.ebuild5
-rw-r--r--media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch32
3 files changed, 42 insertions, 2 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index a82a2e8bf90a..40fbb880d178 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/alsa-driver
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.133 2005/01/28 16:28:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.134 2005/02/18 23:37:27 luckyduck Exp $
+
+ 19 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+ +files/1.0.8-msi_audigyls.patch, alsa-driver-1.0.8.ebuild:
+ added patch which were contribution by Søren Dalby Larsen <sdl@larsen.dk>.
+ fixes #81666
28 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> alsa-driver-1.0.8.ebuild:
applied patch which Daniel Black <dragonheart@gentoo.org> provided, also see
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
index 26c9adefb88f..f15a76dc8de4 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.8.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-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.6 2005/01/28 16:28:57 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.8.ebuild,v 1.7 2005/02/18 23:37:27 luckyduck Exp $
IUSE="oss doc"
inherit linux-mod flag-o-matic eutils
@@ -62,6 +62,9 @@ src_unpack() {
cd ${S}
+ #see #81666
+ epatch ${FILESDIR}/${PV}-msi_audigyls.patch
+
convert_to_m ${S}/Makefile
}
diff --git a/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch b/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch
new file mode 100644
index 000000000000..3e39e51b8a59
--- /dev/null
+++ b/media-sound/alsa-driver/files/1.0.8-msi_audigyls.patch
@@ -0,0 +1,32 @@
+--- alsa-driver-1.0.8/alsa-kernel/pci/ca0106/ca0106_main.c 2005-01-04 14:55:46.000000000 +0100
++++ /home/sdl/ca0106_main.c 2005-02-11 22:11:46.000000000 +0100
+@@ -169,6 +169,7 @@
+ { 0x10051102, "AudigyLS [SB0310b]"} , /* Unknown AudigyLS that also says SB0310 on it */
+ { 0x10061102, "Live! 7.1 24bit [SB0410]"} , /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
+ { 0x10071102, "Live! 7.1 24bit [SB0413]"} , /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97. */
++ { 0x10091462, "AudigyLS by MSI [SB0438]"}, /* MSI SB Audigy2LS without AC97 */
+ { 0, "AudigyLS [Unknown]" }
+ };
+
+@@ -1133,7 +1134,9 @@
+ snd_ca0106_ptr_write(chip, CAPTURE_SOURCE, 0x0, 0x333300e4); /* Select MIC, Line in, TAD in, AUX in */
+ chip->capture_source = 3; /* Set CAPTURE_SOURCE */
+
+- if ((chip->serial == 0x10061102) || (chip->serial == 0x10071102) ) { /* The SB0410 and SB0413 use GPIO differently. */
++ if ((chip->serial == 0x10061102) ||
++ (chip->serial == 0x10071102) ||
++ (chip->serial == 0x10091462)) { /* The SB0410 and SB0413 use GPIO differently. */
+ /* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
+ outl(0x0, chip->port+GPIO);
+ //outl(0x00f0e000, chip->port+GPIO); /* Analog */
+@@ -1200,7 +1203,9 @@
+ snd_card_free(card);
+ return err;
+ }
+- if ((chip->serial != 0x10061102) && (chip->serial != 0x10071102) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
++ if ((chip->serial != 0x10061102) &&
++ (chip->serial != 0x10071102) &&
++ (chip->serial != 0x10091462) ) { /* The SB0410 and SB0413 do not have an ac97 chip. */
+ if ((err = snd_ca0106_ac97(chip)) < 0) {
+ snd_card_free(card);
+ return err;