1.0.3 stable on x86. version bump.

5 files changed, 126 insertions, 5 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index c4c4624b7213..b7e885f50b86 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-driver
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.77 2004/03/28 05:17:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.78 2004/04/04 18:25:30 eradicator Exp $
+
+*alsa-driver-1.0.4 (04 Apr 2004)
+
+  04 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.3.ebuild, alsa-driver-1.0.4.ebuild:
+  1.0.3 stable on x86.  version bump.
 
   28 Mar 2004; Aron Griffis <agriffis@gentoo.org> alsa-driver-1.0.3.ebuild:
   Mark stable on alpha and ia64 since eradicator eradicated the versions that
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 6068c39c2c58..958c59a5059e 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,7 +1,8 @@
 MD5 3a832f8e243a523db06b78f64496010f alsa-driver-0.5.12a.ebuild 1674
 MD5 5b3c57a23a9a20cf50693dcbd71387e5 alsa-driver-0.9.2.ebuild 2695
-MD5 b3c9be7bd574f83c5a9f8cec65c72131 alsa-driver-1.0.3.ebuild 3261
-MD5 c0692a2fd6d4001557acf444c6a877dd ChangeLog 13685
+MD5 9b55abb7e0acb3315ba6782af6d71604 alsa-driver-1.0.4.ebuild 3265
+MD5 2893d046c496cde92f1fafd21b6ba694 alsa-driver-1.0.3.ebuild 3262
+MD5 a19d11338368b06728e985a03d6389c7 ChangeLog 13871
 MD5 977252129edb014d00f4bf5421f54724 alsa-driver-1.0.2c.ebuild 2686
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 67c2da5b847168398d251c18c8c6f683 alsa-driver-0.9.0_rc2.ebuild 2664
@@ -15,6 +16,7 @@ MD5 9732f15dfab42b3c1556f546f14f041f files/alsa-modules.conf-rc 1161
 MD5 5283280b5f72b9ea25f3e1e1adcde464 files/digest-alsa-driver-0.9.2 71
 MD5 439dab13c036317c9b308b234ecf7290 files/digest-alsa-driver-0.9.8 71
 MD5 938a2ee36c54416322d1acd47b249c99 files/digest-alsa-driver-1.0.3 71
+MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4 71
 MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
 MD5 8c81382138ab9223d1e0abdfdb1e5e98 files/alsa-modules.conf 1088
 MD5 ac8c1852768868cb9c61a07e6baddc3a files/digest-alsa-driver-0.5.12a 72
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
index 6aefd3553bda..5b7282174294 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.3 2004/03/28 05:17:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.3.ebuild,v 1.4 2004/04/04 18:25:30 eradicator Exp $
 
 inherit eutils kernel-mod
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 PROVIDE="virtual/alsa"
 
 SLOT="${KV}"
-KEYWORDS="~x86 ~ppc -sparc ~amd64 alpha ia64"
+KEYWORDS="x86 ~ppc -sparc ~amd64 alpha ia64"
 
 MY_P=${P/_rc/rc}
 SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild
new file mode 100644
index 000000000000..06ed68225b26
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.4.ebuild,v 1.1 2004/04/04 18:25:30 eradicator Exp $
+
+inherit eutils kernel-mod
+
+DESCRIPTION="Advanced Linux Sound Architecture kernel modules"
+HOMEPAGE="http://www.alsa-project.org/"
+LICENSE="GPL-2 LGPL-2.1"
+
+# 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
+
+IUSE="oss"
+
+RDEPEND="virtual/modutils"
+
+DEPEND="${RDEPEND}
+	virtual/linux-sources
+	sys-devel/autoconf
+	sys-apps/debianutils"
+
+PROVIDE="virtual/alsa"
+
+SLOT="${KV}"
+KEYWORDS="~x86 ~ppc -sparc ~amd64 ~alpha ~ia64"
+
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/driver/${P}.tar.bz2"
+RESTRICT="nomirror" # nouserpriv is neccessary for 2.6.x kernels... Hopefully the ALSA guys will figure out another way to do this...
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# The makefile still installs an alsasound initscript,
+	# which we REALLY dont want.
+	# This patch stops that
+	epatch ${FILESDIR}/makefile.patch || die "Makefile patch failed"
+	epatch ${FILESDIR}/${PN}-0.9.8-au-fix.patch
+
+	if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
+		FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
+
+		if ! [ -d "${FULL_KERNEL_PATH}" ]; then
+			eerror "An error seems to have occurred.  We looked in ${FULL_KERNEL_PATH} for your kernel sources, but we didn't see them."
+			die "ALSA driver configuration failure."
+		fi
+
+		einfo "A 2.5 or 2.6 kernel was detected.  We are copying the kernel source tree from"
+		einfo "${FULL_KERNEL_PATH} to ${T}/linux"
+		einfo "because the alsa-driver build process overwrites files in the 2.6.x kernel tree."
+
+		# Copy everything over to our tmp dir...
+		cp -a ${FULL_KERNEL_PATH} ${T}/linux
+	fi
+}
+
+src_compile() {
+	# Default ARCH & kernel path to set in compilation and make
+	KER_ARCH=${ARCH}
+	KER_DIR=${KERNEL_DIR}
+
+	# If we're using a 2.5 or 2.6 kernel, use our copied kernel tree.
+	if [ -d "${T}/linux" ]; then
+		KER_DIR="${T}/linux"
+
+		# Set the kernel ARCH
+		use x86 && KER_ARCH="i386"
+		use amd64 && KER_ARCH="x86_64"
+	fi
+
+	econf `use_with oss` \
+		--with-kernel="${KER_DIR}" \
+		--with-isapnp=yes \
+		--with-sequencer=yes \
+		--with-cards="${ALSA_CARDS}"
+
+	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
+}
+
+
+src_install() {
+	dodir /usr/include/sound
+	make DESTDIR=${D} install || die
+
+	rm doc/Makefile
+	dodoc CARDS-STATUS COPYING FAQ INSTALL README WARNING TODO doc/*
+}
+
+pkg_postinst() {
+	if [ "${ROOT}" = / ]
+	then
+		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
+	fi
+
+	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
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4
new file mode 100644
index 000000000000..d70af40d079b
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4
@@ -0,0 +1 @@
+MD5 30684fbfcc84633df9740ab3f8e6bc97 alsa-driver-1.0.4.tar.bz2 1717290