Added xbox patch, bug #47166

4 files changed, 36 insertions, 12 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 9510e37c19fb..c11aaa2d5905 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.90 2004/07/19 19:14:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.91 2004/07/23 10:41:10 chrb Exp $
+
+  23 Jul 2004; Chris Bainbridge <chrb@gentoo.org> alsa-driver-1.0.5a.ebuild:
+  Added xbox patch, bug #47166
 
   19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.5a.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index fde5962d8d33..b86ebf1106ac 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,32 +1,33 @@
-MD5 e204176bba3daa747fbaf9e2045279e1 ChangeLog 15769
+MD5 337b6c928bc7d2c4f5a3720acd169b34 ChangeLog 15872
 MD5 026a5a0f8960fc534ec6d185abb4132c alsa-driver-0.5.12a.ebuild 1631
 MD5 8ff5672cfed8d913e66446218994fb95 alsa-driver-0.9.0_rc2.ebuild 2591
 MD5 762a907f2d79a10c1c2c4f1975f0241d alsa-driver-0.9.2.ebuild 2666
 MD5 559f5f09d96e8df804b032ee15ce3e54 alsa-driver-0.9.8.ebuild 2343
-MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 d70eb467d238a4de4be2dd27a5723b80 alsa-driver-1.0.4.ebuild 3307
 MD5 887c661fd601217db70b024050aef57b alsa-driver-1.0.2c.ebuild 2653
+MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
 MD5 4d03ed1eb6c9b3f96d24d44b4a13a0a2 alsa-driver-1.0.4-r1.ebuild 3365
+MD5 d70eb467d238a4de4be2dd27a5723b80 alsa-driver-1.0.4.ebuild 3307
 MD5 1c0c3dcd6ae51dceb641f8ff07c76603 alsa-driver-1.0.5.ebuild 3360
-MD5 683bc10d021eebe226c52f1e0be9bada alsa-driver-1.0.5a.ebuild 3517
+MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 038c19b8373300acfa319a0e6c73fb52 files/alsasound 4611
 MD5 45f2cf526eaa8ff274ac6876f15302d1 files/alsa 518
 MD5 87448a6155eb013f2b14e4a531ffc25a files/alsa-driver-0.9.0rc1-ppc.patch 358
-MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4 71
+MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
 MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
+MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
 MD5 657d40f6eb97192ec88c1a303b34ca7e files/alsa-modules.conf 1091
 MD5 52a0b912fdff1c0dfe49525eb1002f00 files/alsa-modules.conf-rc 1164
 MD5 ac8c1852768868cb9c61a07e6baddc3a files/digest-alsa-driver-0.5.12a 72
 MD5 e3912a14a13dae85c5ee17f351733bae files/digest-alsa-driver-0.9.0_rc2 74
 MD5 5283280b5f72b9ea25f3e1e1adcde464 files/digest-alsa-driver-0.9.2 71
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
+MD5 5f8f784625ea9710adde055f639dcbeb files/digest-alsa-driver-1.0.2c 72
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
+MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4 71
 MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4-r1 71
-MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
-MD5 08af7cfec9cd33819c62880d6219f3a5 files/alsa-driver-1.0.5-devfix.patch 763
-MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
-MD5 5f8f784625ea9710adde055f639dcbeb files/digest-alsa-driver-1.0.2c 72
 MD5 06c2fc65e1f20840ecea92fae417205e files/digest-alsa-driver-1.0.5 71
 MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
+MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 MD5 a2ee6fa920bbac70835b4a58e5759e8c files/alsa-driver-1.0.5a-cs46xx-passthrough.patch 446
+MD5 8bb31a005a1db2e306c51d017fd44e70 files/alsa-driver-1.0.5a-xbox-ac97.patch 721
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
index 0e22ad87efb5..f6b6bb35a8c8 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.5a.ebuild,v 1.4 2004/07/21 16:24:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild,v 1.5 2004/07/23 10:41:10 chrb Exp $
 
 inherit kernel-mod flag-o-matic eutils
 
@@ -45,6 +45,10 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${P}-cs46xx-passthrough.patch
 
+	if [ "${PROFILE_ARCH}" == "xbox" ]; then
+		epatch ${FILESDIR}/${P}-xbox-ac97.patch
+	fi
+
 	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
 		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
 
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.5a-xbox-ac97.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.5a-xbox-ac97.patch
new file mode 100644
index 000000000000..3cb97d37d1d1
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.5a-xbox-ac97.patch
@@ -0,0 +1,16 @@
+diff -cr alsa-driver-1.0.5a.orig/alsa-kernel/pci/ac97/ac97_codec.c alsa-driver-1.0.5a/alsa-kernel/pci/ac97/ac97_codec.c
+*** alsa-driver-1.0.5a.orig/alsa-kernel/pci/ac97/ac97_codec.c	Sun May 30 17:40:04 2004
+--- alsa-driver-1.0.5a/alsa-kernel/pci/ac97/ac97_codec.c	Fri Jul 23 10:45:09 2004
+***************
+*** 1877,1882 ****
+--- 1877,1886 ----
+  		if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a06)
+  			ac97->scaps |= AC97_SCAP_AUDIO;
+  	}
++ 
++ 	// xbox fails test because of no audio input or mixer hardware, so force audio on
++ 	ac97->scaps |= AC97_SCAP_AUDIO;
++ 
+  	if (ac97->scaps & AC97_SCAP_AUDIO) {
+  		ac97->caps = snd_ac97_read(ac97, AC97_RESET);
+  		ac97->ext_id = snd_ac97_read(ac97, AC97_EXTENDED_ID);