Add patch to support MCP55 sound boards, thanks to Doug Goldstein (cardoe) in bug #138780.

(Portage version: 2.1.1_pre1-r5)

4 files changed, 200 insertions, 1 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index fdea7d162f6a..90cd7ef50157 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.219 2006/06/23 12:48:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.220 2006/07/01 23:16:18 flameeyes Exp $
+
+*alsa-driver-1.0.12_rc1-r1 (01 Jul 2006)
+
+  01 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-driver-mcp55.patch, +alsa-driver-1.0.12_rc1-r1.ebuild:
+  Add patch to support MCP55 sound boards, thanks to Doug Goldstein (cardoe)
+  in bug #138780.
 
 *alsa-driver-1.0.12_rc1 (23 Jun 2006)
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.ebuild
new file mode 100644
index 000000000000..f52256de88f8
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.12_rc1-r1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 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.12_rc1-r1.ebuild,v 1.1 2006/07/01 23:16:18 flameeyes Exp $
+
+inherit linux-mod flag-o-matic eutils multilib
+
+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/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss doc debug"
+
+RDEPEND="virtual/modutils
+	 ~media-sound/alsa-headers-${PV}
+	 !media-sound/snd-aoa"
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	sparc? ( >=sys-devel/autoconf-2.50 )
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+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
+	#
+	ALSA_CARDS=${ALSA_CARDS:-all}
+
+	# Which drivers need PNP
+	local PNP_DRIVERS="interwave interwave-stb"
+
+	CONFIG_CHECK="SOUND"
+	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."
+	PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}).  Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	if [[ "${ALSA_CARDS}" == "all" ]]; then
+
+		# Ignore PNP checks for ppc architecture, as PNP can't be enabled there.
+		if [[ ${ARCH} != "ppc" ]]; then
+			CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		fi
+	else
+		for pnpdriver in ${PNP_DRIVERS}; do
+			hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP"
+		done
+	fi
+
+	linux-mod_pkg_setup
+
+	if [[ ${PROFILE_ARCH} == "sparc64" ]] ; then
+		export CBUILD=${CBUILD-${CHOST}}
+		export CHOST="sparc64-unknown-linux-gnu"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-1.0.10_rc1-include.patch"
+
+	epatch "${FILESDIR}/${PN}-mcp55.patch"
+
+	if kernel_is ge 2 6 17 ; then
+		# These are needed for some drivers to build with kernel 2.6.17
+		# until a refreshed release of alsa-driver is done
+		epatch "${FILESDIR}/${PN}-1.0.11-kernel-2.6.17.patch"
+
+		# asihpi driver is broken, skip it until upstream releases something
+		# working.
+		# sed -i -e 's:asihpi/::' "${S}/pci/Makefile"
+	fi
+
+	convert_to_m "${S}/Makefile"
+	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
+}
+
+src_compile() {
+	local myABI=${ABI:-${DEFAULT_ABI}}
+
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+	append-flags "-I${KV_DIR}/arch/$(tc-arch-kernel)/include"
+
+	econf $(use_with oss) \
+		$(use_with debug debug full) \
+		--with-kernel="${KV_DIR}" \
+		--with-build="${KV_OUT_DIR}" \
+		--with-isapnp=yes \
+		--with-sequencer=yes \
+		--with-cards="${ALSA_CARDS}" || die "econf failed"
+
+	# linux-mod_src_compile doesn't work well with alsa
+
+	ARCH=$(tc-arch-kernel)
+	ABI=${KERNEL_ABI}
+	emake LDFLAGS="$(raw-ldflags)" HOSTCC=$(tc-getBUILD_CC) CC=$(tc-getCC) || die "Make Failed"
+	ARCH=$(tc-arch)
+	ABI=${myABI}
+
+	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() {
+	emake DESTDIR=${D} install-modules || die "make install failed"
+
+	dodoc CARDS-STATUS 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
+
+	if kernel_is 2 6; then
+		# mv the drivers somewhere they won't be killed by the kernel's make modules_install
+		mv ${D}/lib/modules/${KV_FULL}/kernel/sound ${D}/lib/modules/${KV_FULL}/${PN}
+		rmdir ${D}/lib/modules/${KV_FULL}/kernel &> /dev/null
+	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
+
+	einfo "Check out the ALSA installation guide availible at the following URL:"
+	einfo "http://www.gentoo.org/doc/en/alsa-guide.xml"
+
+	if kernel_is 2 6 && [ -e ${ROOT}/lib/modules/${KV_FULL}/kernel/sound ]; then
+		# Cleanup if they had older alsa installed
+		for file in $(find ${ROOT}/lib/modules/${KV_FULL}/${PN} -type f); do
+			rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound}
+		done
+
+		for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do
+			rmdir ${dir} &> /dev/null
+		done
+	fi
+}
diff --git a/media-sound/alsa-driver/files/alsa-driver-mcp55.patch b/media-sound/alsa-driver/files/alsa-driver-mcp55.patch
new file mode 100644
index 000000000000..d95b86440dcf
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-mcp55.patch
@@ -0,0 +1,10 @@
+--- alsa-kernel/pci/intel8x0.c	2006-06-22 12:24:28.000000000 -0400
++++ alsa-kernel/pci/intel8x0.c.new	2006-06-30 22:37:14.000000000 -0400
+@@ -434,6 +434,7 @@
+ 	{ 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* NFORCE3 */
+ 	{ 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* CK8S */
+ 	{ 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* MCP51 */
++	{ 0x10de, 0x0371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },	/* MCP55 */
+ 	{ 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },	/* AMD8111 */
+ 	{ 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },	/* AMD768 */
+ 	{ 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI },   /* Ali5455 */
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1-r1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1-r1
new file mode 100644
index 000000000000..b92ea29b4294
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.12_rc1-r1
@@ -0,0 +1,3 @@
+MD5 78d721fbbf51d84752c39313de06336a alsa-driver-1.0.12rc1.tar.bz2 2395489
+RMD160 ec682a22f7046c3786dcb069e20fc1fe1e82cbe9 alsa-driver-1.0.12rc1.tar.bz2 2395489
+SHA256 1d4b44a755e67a1322b15533ffa1e8e3b6f4eca623f786be86e3d9ad8cc0cea3 alsa-driver-1.0.12rc1.tar.bz2 2395489