Added new xbox patch.

5 files changed, 171 insertions, 19 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 6221224a17c6..027fc5c4e9e3 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.119 2004/12/08 09:58:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.120 2004/12/09 10:24:51 chrb Exp $
+
+*alsa-driver-1.0.7-r4 (08 Dec 2004)
+
+  08 Dec 2004; Chris Bainbridge <chrb@gentoo.org>
+  +files/alsa-driver-1.0.7-xbox-hw1.6fix.patch,
+  +alsa-driver-1.0.7-r4.ebuild:
+  New patch for hw version 1.6 xbox.
 
   08 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.7-r3.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 7ba74b8e65b7..edbed557d99a 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,33 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2bffdc5a4d077bb2df8786552e98fa40 ChangeLog 20493
-MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341
+MD5 f464881fcd9afcfa2ed09bbac214a040 ChangeLog 20698
+MD5 b81aab878b064a80c50137b176874b8e alsa-driver-1.0.7-r4.ebuild 3667
 MD5 d97bd9215a401af2d4d9f5576be94a01 alsa-driver-1.0.7-r3.ebuild 3673
+MD5 d388a1b0706024ddccccc99045b976f9 alsa-driver-0.9.8.ebuild 2341
 MD5 e5de43659b629d1e9f0ee8d3f1864840 alsa-driver-1.0.3.ebuild 3363
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603
 MD5 45f95cf50aad5f544f0fa05dcf94d1ad alsa-driver-1.0.6a.ebuild 3501
+MD5 9f0283e4e9611766ad3110532d4976d7 alsa-driver-1.0.5a.ebuild 3603
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 bc0105e64f35a41aa0602c43e7f09733 files/alsa-driver-1.0.7-configure.patch 21924
 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 831a1a1097613c2444cc3e512ff09a01 files/alsa-driver-1.0.7-audigy71.patch 643
+MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
+MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r4 71
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
 MD5 e1b13905eac70fe728dcb85fcaac27a9 files/digest-alsa-driver-1.0.6a 72
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
-MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
-MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
-MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
 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
+MD5 27684bd356b1a43809d3f8c847a6abce files/alsa-driver-1.0.6a-kbuild.patch 575
+MD5 f9d35aa6adca1137e05b1cb8852ff672 files/alsa-driver-1.0.6a-emu10k1-passthrough.patch 658
 MD5 4d7c4de4eaa3007e13360d7434ecb284 files/alsa-driver-1.0.7-ioctl32.patch-r2 44165
-MD5 479ee887025f4ce7944adee1e4a6fdf3 files/digest-alsa-driver-1.0.7-r3 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBttBHArHZZzCEUG0RAlKnAJ0efz+G5KtO95FVi5oRtdyTGoe/aACfaUKw
-9Ud78/U20mPGxTx+59u5qVk=
-=hwbg
------END PGP SIGNATURE-----
+MD5 8cfc2afad77baecf06694bee8bd67d4a files/alsa-driver-1.0.7-xbox.patch 645
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
new file mode 100644
index 000000000000..71e1727e2791
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.7-r4.ebuild
@@ -0,0 +1,140 @@
+# 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.7-r4.ebuild,v 1.1 2004/12/09 10:24:51 chrb Exp $
+
+IUSE="oss doc"
+inherit linux-mod flag-o-matic eutils
+
+MY_P=${P/_rc/rc}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="virtual/modutils
+	 ~media-sound/alsa-headers-${PV}"
+
+DEPEND="${RDEPEND}
+	sys-devel/patch
+	virtual/linux-sources
+	>=sys-devel/autoconf-2.50
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+pkg_setup() {
+	CONFIG_CHECK="SOUND !SND !SOUND_PRIME"
+	SND_ERROR="ALSA is already compiled into the kernel."
+	SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.  Please disable them and re-emerge alsa-driver."
+
+	linux-mod_pkg_setup
+
+	# By default, drivers for all supported cards will be compiled.
+	# If you want to only compile for specific card(s), set ALSA_CARDS
+	# environment to a space-separated list of drivers that you want to build.
+	# For example:
+	#
+	#   env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver
+	#
+	[ -z "${ALSA_CARDS}" ] && ALSA_CARDS=all
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
+
+	[ "${PROFILE_ARCH}" == "xbox" ] && \
+		epatch ${FILESDIR}/${PN}-1.0.7-xbox.patch
+
+	convert_to_m ${S}/Makefile
+
+	# Fix ioctl32 support
+	epatch ${FILESDIR}/${P}-ioctl32.patch-r2
+
+	# Fix audigy 7.1 detection on some cards... bug #72433
+	epatch ${FILESDIR}/${P}-audigy71.patch
+
+	# Fix order of configure operations so the kernel compiler isn't used
+	# for tests.
+	epatch ${FILESDIR}/${PN}-1.0.7-configure.patch
+	export WANT_AUTOCONF=2.5
+	autoconf
+}
+
+src_compile() {
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+
+	econf `use_with oss` \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_DIR}" \
+		--with-isapnp=yes \
+		--with-sequencer=yes \
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# linux-mod_src_compile doesn't work well with alsa
+	unset ARCH
+	# -j1 : see bug #71028
+	emake -j1 || die "Parallel Make Failed"
+
+	if use doc;
+	then
+		ebegin "Building Documentation"
+		cd ${S}/scripts
+		emake || die Failed making docs in ${S}/scripts
+
+		cd ${S}/doc/DocBook
+		emake || die Failed making docs in ${S}/doc/DocBook
+		eend $?
+	fi
+}
+
+
+src_install() {
+	dodir /usr/include/sound
+	make DESTDIR=${D} install || die
+
+	# Provided by alsa-headers now
+	rm -rf ${D}/usr/include/sound
+
+	# We have our own scripts in alsa-utils
+	test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
+	test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound
+
+	dodoc CARDS-STATUS INSTALL FAQ README WARNING TODO
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		rm ${D}/usr/share/doc/${PF}/doc/Makefile.gz
+
+		docinto DocBook
+		dodoc doc/DocBook/*
+		rm ${D}/usr/share/doc/${PF}/DocBook/Makefile.gz
+
+		docinto Documentation
+		dodoc sound/Documentation/*
+	fi
+}
+
+pkg_postinst() {
+	einfo
+	einfo "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
+	einfo
+	einfo "Also, remember that all mixer channels will be MUTED by default."
+	einfo "Use the 'alsamixer' program to unmute them."
+	einfo
+	einfo "Version 1.0.3 and above should work with version 2.6 kernels."
+	einfo "If you experience problems, please report bugs to http://bugs.gentoo.org."
+	einfo
+
+	linux-mod_pkg_postinst
+}
diff --git a/media-sound/alsa-driver/files/alsa-driver-1.0.7-xbox.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.7-xbox.patch
new file mode 100644
index 000000000000..5491362ba18a
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.7-xbox.patch
@@ -0,0 +1,11 @@
+--- alsa-driver-1.0.7.orig/alsa-kernel/pci/ac97/ac97_codec.c	2004-10-13 10:26:12.000000000 +0100
++++ alsa-driver-1.0.7/alsa-kernel/pci/ac97/ac97_codec.c	2004-12-08 10:31:24.785816848 +0000
+@@ -1968,7 +1968,7 @@
+       __access_ok:
+ 	ac97->id = snd_ac97_read(ac97, AC97_VENDOR_ID1) << 16;
+ 	ac97->id |= snd_ac97_read(ac97, AC97_VENDOR_ID2);
+-	if (ac97->id == 0x00000000 || ac97->id == 0xffffffff) {
++	((ac97->scaps&AC97_SCAP_DETECT_BY_VENDOR)==0 && (ac97->id == 0x00000000 || ac97->id == 0xffffffff)) {
+ 		snd_printk(KERN_ERR "AC'97 %d access is not valid [0x%x], removing mixer.\n", ac97->num, ac97->id);
+ 		snd_ac97_free(ac97);
+ 		return -EIO;
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r4 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r4
new file mode 100644
index 000000000000..daf5cb7de471
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.7-r4
@@ -0,0 +1 @@
+MD5 30be8b50ab699f917fb20537bc6509ad alsa-driver-1.0.7.tar.bz2 1829053