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
commit85abf5081fc849d59b5ac1c9572624b77cb037bb (patch)
tree6dbc2bd29f2c4f45b98e8028de01d42dee0fc94a /media-sound
parentVersion bump. (diff)
downloadhistorical-85abf5081fc849d59b5ac1c9572624b77cb037bb.tar.gz
historical-85abf5081fc849d59b5ac1c9572624b77cb037bb.tar.bz2
historical-85abf5081fc849d59b5ac1c9572624b77cb037bb.zip
added patch which were contribution by Søren Dalby Larsen <sdl@larsen.dk>. fixes #81666
Package-Manager: portage-2.0.51.16
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/alsa-driver/ChangeLog7
-rw-r--r--media-sound/alsa-driver/Manifest5
-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
4 files changed, 45 insertions, 4 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/Manifest b/media-sound/alsa-driver/Manifest
index e2befeacde6b..037da80a3a39 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -2,9 +2,9 @@ MD5 37ec8a5ebd0f6a68e2ea0c5ab9a421d8 alsa-driver-1.0.7-r3.ebuild 3824
MD5 bb1d66bcbe75c22ab458272c4f893754 alsa-driver-1.0.8_rc1.ebuild 3549
MD5 9b2cf1594fd2216b4c6ce2e0f26616fb alsa-driver-1.0.5a.ebuild 3609
MD5 dd9beca8be6b9eb6c3f3266ed81a2776 alsa-driver-1.0.7-r4.ebuild 4758
-MD5 7b28306dfe39a08ae2edf9b3cf25f73a alsa-driver-1.0.8.ebuild 3830
+MD5 ac18087eb1d604e275684cbe79bd4d28 alsa-driver-1.0.8.ebuild 3889
MD5 3c0f4daec01807f3cce65c8fff87ff3f alsa-driver-1.0.3.ebuild 3366
-MD5 5ca4f547d8ee321561df6ce68c31a88d ChangeLog 23168
+MD5 448ef8453413e386b34c18a5636e2917 ChangeLog 23375
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
MD5 ebbacca951ebb440e5236ada4a110783 alsa-driver-1.0.6a.ebuild 3531
MD5 d417126925406313a627c240a60c480f alsa-driver-0.9.8.ebuild 2315
@@ -28,3 +28,4 @@ MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44
MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
MD5 bc0105e64f35a41aa0602c43e7f09733 files/alsa-driver-1.0.7-configure.patch 21924
+MD5 5445a523e0e8aa31b9f293b1ac380b37 files/1.0.8-msi_audigyls.patch 1771
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;