Adding 1.0.5a which is a small bugfix release from upstream. This fixes a crucial bug and is thus going straight into stable.

4 files changed, 144 insertions, 18 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 6f6a14bcfce3..8eb1808054d7 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.87 2004/06/24 23:48:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.88 2004/06/25 07:53:47 eradicator Exp $
+
+*alsa-driver-1.0.5a (25 Jun 2004)
+
+  25 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +alsa-driver-1.0.5a.ebuild:
+  Adding 1.0.5a which is a small bugfix release from upstream. This fixes a
+  crucial bug and is thus going straight into stable.
 
   24 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-1.0.5.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 049df3ec500e..77c72bc1d697 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,29 +1,31 @@
+MD5 3af6c795dfb4fc62813dd93d7a1a7562 ChangeLog 15117
 MD5 a5d2d17205e8479ff1b3a471e0e4661e alsa-driver-0.5.12a.ebuild 1631
-MD5 877620814180fa005b3ca3fea1afc17d alsa-driver-1.0.5.ebuild 3381
+MD5 e881783de1b744c04e634701722599eb alsa-driver-0.9.0_rc2.ebuild 2590
 MD5 4ee7ce82bc5d7fa9516718882c160a6c alsa-driver-0.9.2.ebuild 2665
-MD5 76541c3e45b8da67fd12552e3c47091d alsa-driver-1.0.4.ebuild 3328
-MD5 a5d8bc7e346d119fe17bd7721d91ceee alsa-driver-1.0.4-r1.ebuild 3386
-MD5 92910e3527135dccc42889acbe22a8de alsa-driver-1.0.3.ebuild 3383
-MD5 3af6c795dfb4fc62813dd93d7a1a7562 ChangeLog 15117
+MD5 3548eaf6b04cccf8f525616a72c50f7e alsa-driver-0.9.8.ebuild 2365
 MD5 60348fe0f567215f2071923587357d64 alsa-driver-1.0.2c.ebuild 2675
+MD5 92910e3527135dccc42889acbe22a8de alsa-driver-1.0.3.ebuild 3383
+MD5 a5d8bc7e346d119fe17bd7721d91ceee alsa-driver-1.0.4-r1.ebuild 3386
+MD5 76541c3e45b8da67fd12552e3c47091d alsa-driver-1.0.4.ebuild 3328
+MD5 877620814180fa005b3ca3fea1afc17d alsa-driver-1.0.5.ebuild 3381
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 e881783de1b744c04e634701722599eb alsa-driver-0.9.0_rc2.ebuild 2590
-MD5 3548eaf6b04cccf8f525616a72c50f7e alsa-driver-0.9.8.ebuild 2365
+MD5 877620814180fa005b3ca3fea1afc17d alsa-driver-1.0.5a.ebuild 3381
+MD5 b90be2dac383a8357911e2a9c1e2ea07 files/alsasound 4607
 MD5 45f2cf526eaa8ff274ac6876f15302d1 files/alsa 518
-MD5 5f8f784625ea9710adde055f639dcbeb files/digest-alsa-driver-1.0.2c 72
-MD5 e3912a14a13dae85c5ee17f351733bae files/digest-alsa-driver-0.9.0_rc2 74
 MD5 87448a6155eb013f2b14e4a531ffc25a files/alsa-driver-0.9.0rc1-ppc.patch 358
-MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
-MD5 7bbc6b637f769a25170b28da0a4b4401 files/alsa-modules.conf-rc 1160
+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 5bc2d792b1b4772000a379a655305e98 files/alsa-modules.conf 1087
+MD5 7bbc6b637f769a25170b28da0a4b4401 files/alsa-modules.conf-rc 1160
+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 06c2fc65e1f20840ecea92fae417205e files/digest-alsa-driver-1.0.5 71
-MD5 1d70561326ef89e94179634d92782610 files/alsa-driver-1.0.4-devfix.patch 2756
-MD5 8c120f7730b91118d0a8148d2deb3a43 files/alsa-driver-0.9.8-au-fix.patch 1267
-MD5 5bc2d792b1b4772000a379a655305e98 files/alsa-modules.conf 1087
-MD5 ac8c1852768868cb9c61a07e6baddc3a files/digest-alsa-driver-0.5.12a 72
 MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4-r1 71
-MD5 b90be2dac383a8357911e2a9c1e2ea07 files/alsasound 4607
+MD5 06c2fc65e1f20840ecea92fae417205e files/digest-alsa-driver-1.0.5 71
+MD5 27ccbe36406f145c1d63725a53517233 files/makefile.patch 1122
+MD5 deb0bfd8e2cfe0ba434fb5a820294502 files/digest-alsa-driver-1.0.5a 72
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
new file mode 100644
index 000000000000..ba9f9d976cc7
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
@@ -0,0 +1,116 @@
+# 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.1 2004/06/25 07:53:47 eradicator Exp $
+
+inherit kernel-mod flag-o-matic eutils
+
+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}
+	epatch ${FILESDIR}/${PN}-1.0.5-devfix.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}" || die "econf failed"
+
+	# Should fix bug #46901
+	is-flag "-malign-double" && filter-flags "-fomit-frame-pointer"
+
+	emake ARCH="${KER_ARCH}" || die "Parallel Make Failed"
+}
+
+
+src_install() {
+	dodir /usr/include/sound
+	make DESTDIR=${D} install || die
+
+	# 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
+
+	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.5a b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5a
new file mode 100644
index 000000000000..e54298f3877b
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5a
@@ -0,0 +1 @@
+MD5 019d190e0499c77c6a4922477ae2f5d4 alsa-driver-1.0.5a.tar.bz2 1729509