Version Bump.

9 files changed, 218 insertions, 2 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 0a2a05f1fc22..38f42e21dd91 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,18 @@
 # 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.84 2004/04/26 03:50:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.85 2004/05/31 04:58:43 eradicator Exp $
+
+*alsa-driver-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.5.ebuild, files/alsa-driver-1.0.5-devfix.patch:
+  Version Bump.
+
+*alsa-driver-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.5.ebuild, files/alsa-driver-1.0.5-devfix.patch:
+  Version Bump.
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> alsa-driver-1.0.3.ebuild,
   alsa-driver-1.0.4-r1.ebuild, alsa-driver-1.0.4.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index af389ed22e4e..cef959621b3b 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,4 +1,5 @@
 MD5 816a4caab9fc3864e6598f48f17c6bcb alsa-driver-0.5.12a.ebuild 1642
+MD5 f09c925421f272f530f550662625d844 alsa-driver-1.0.5.ebuild 3395
 MD5 31e13110b6c09e1b30165f63fd002883 alsa-driver-0.9.2.ebuild 2676
 MD5 4f6460f7e4312d8760440e058d5315c7 alsa-driver-1.0.4.ebuild 3337
 MD5 f09c925421f272f530f550662625d844 alsa-driver-1.0.4-r1.ebuild 3395
@@ -18,6 +19,7 @@ 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 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 8c81382138ab9223d1e0abdfdb1e5e98 files/alsa-modules.conf 1088
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5.ebuild
new file mode 100644
index 000000000000..22ef607a6086
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.5.ebuild
@@ -0,0 +1,116 @@
+# 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.5.ebuild,v 1.1 2004/05/31 04:58:43 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}/${P}-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/alsa-driver-1.0.5-devfix.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.5-devfix.patch
new file mode 100644
index 000000000000..fa950412e536
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.5-devfix.patch
@@ -0,0 +1,20 @@
+diff -Naur alsa-driver-1.0.5.orig/hal2/hal2.c alsa-driver-1.0.5/hal2/hal2.c
+--- alsa-driver-1.0.5.orig/hal2/hal2.c	2002-10-21 11:53:22.000000000 -0700
++++ alsa-driver-1.0.5/hal2/hal2.c	2004-05-30 20:18:34.000000000 -0700
+@@ -134,14 +134,14 @@
+ 	 * true, but it seems to work.
+ 	 */
+ 	if ((err = snd_register_dma_channel(card, "HAL2 record", 0,
+-					    SNDRV_DMA_TYPE_PCI,
++					    SNDRV_DMA_TYPE_DEV,
+ 					    dma1_size[dev], NULL,
+ 					    &hal2card->dma1ptr)) < 0) {
+ 		snd_printk("Couldn't get dma1\n");
+ 		return err;
+ 	}
+ 	if ((err = snd_register_dma_channel(card, "HAL2 playback", 0,
+-					    SNDRV_DMA_TYPE_PCI,
++					    SNDRV_DMA_TYPE_DEV,
+ 					    dma2_size[dev], NULL,
+ 					    &hal2card->dma2ptr)) < 0) {
+ 		snd_printk("Couldn't get dma2\n");
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5
new file mode 100644
index 000000000000..9c58b979d4e6
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.5
@@ -0,0 +1 @@
+MD5 5c6ad2af258038dbf356a25f6ef740d2 alsa-driver-1.0.5.tar.bz2 1728284
diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 436a47eb11c1..24028276a059 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.54 2004/05/23 03:04:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.55 2004/05/31 05:00:04 eradicator Exp $
+
+*alsa-utils-1.0.5 (30 May 2004)
+
+  30 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-utils-1.0.5.ebuild:
+  Version Bump.
 
   22 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-utils-1.0.4.ebuild:
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 5a6f96956ff8..9921719c5ac2 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -4,6 +4,7 @@ MD5 13a5bd581f45f973053558d110a9d5a3 alsa-utils-0.9.0_rc2.ebuild 933
 MD5 6f3ee27370fe01f303df374274ea86c8 alsa-utils-1.0.3.ebuild 1719
 MD5 02f563a274eed85780c02580dba6ee1d alsa-utils-0.9.8.ebuild 1771
 MD5 72d78c6d9aa3ed694a7b2fac133e97f8 alsa-utils-0.5.10-r8.ebuild 975
+MD5 c01e2ebca94ad9bec046fa1892d20a1d alsa-utils-1.0.5.ebuild 1834
 MD5 4eefddc64786fb350f9f81499f550543 ChangeLog 9319
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 849ba596e61a5b0ea0ef6b91726737be alsa-utils-1.0.2.ebuild 1726
@@ -15,6 +16,7 @@ MD5 c393c831cb8bcda375cd4690e85b3495 files/digest-alsa-utils-0.9.8 69
 MD5 937332cbdb9fab58e9e43a58a3f965de files/digest-alsa-utils-1.0.2 69
 MD5 fb1ac340c0b5d2f19099ee4c89100919 files/digest-alsa-utils-1.0.3 69
 MD5 2f5a9c2a8b65900d3e06596e994c58db files/digest-alsa-utils-1.0.4 69
+MD5 c6aff50de146998a737abed55b3dd9f1 files/digest-alsa-utils-1.0.5 69
 MD5 f20045fc395596290d5a6d807ba311fc files/alsa-utils-0.5.10-aplay-destdir.diff 626
 MD5 dcc66ee6a9db24006a4158e2be0da3f2 files/alsa-0.5.10 392
 MD5 a82c4c173c1d617bae9967438c659bac files/digest-alsa-utils-0.5.10-r8 70
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild
new file mode 100644
index 000000000000..20cafc2ad22a
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.5.ebuild
@@ -0,0 +1,56 @@
+# 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-utils/alsa-utils-1.0.5.ebuild,v 1.1 2004/05/31 05:00:04 eradicator Exp $
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+DEPEND=">=sys-libs/ncurses-5.1
+	dev-util/dialog
+	>=media-libs/alsa-lib-1.0.3"
+
+SLOT="0.9"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+MY_P=${P/_rc/rc}
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+IUSE=""
+
+src_install() {
+	local ALSA_UTILS_DOCS="COPYING ChangeLog README TODO
+		seq/aconnect/README.aconnect
+		seq/aseqnet/README.aseqnet"
+
+	make DESTDIR=${D} install || die "Installation Failed"
+
+	dodoc ${ALSA_UTILS_DOCS}
+	newdoc alsamixer/README README.alsamixer
+
+	dodir /etc/init.d
+	insinto /etc/modules.d
+	newins ${FILESDIR}/alsa-modules.conf-rc alsa
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/alsasound
+}
+
+pkg_postinst() {
+	echo
+	einfo "The alsasound initscript is now provided by alsa-utils"
+	einfo "instead of alsa-driver for compatibility with kernel-sources"
+	einfo "which provide ALSA internally."
+	echo
+	einfo "To take advantage of this, and automate the process of"
+	einfo "loading and unloading the ALSA sound drivers as well as"
+	einfo "storing and restoring sound-card mixer levels you should"
+	einfo "add alsasound to the boot runlevel. You can do this as"
+	einfo "root like so:"
+	einfo "	# rc-update add alsasound boot"
+	echo
+	einfo "You will also need to edit the file /etc/modules.d/alsa"
+	einfo "and run modules-update. You can do this like so:"
+	einfo "	# nano -w /etc/modules.d/alsa && modules-update"
+	echo
+}
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-1.0.5 b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.5
new file mode 100644
index 000000000000..99e64f8d6b82
--- /dev/null
+++ b/media-sound/alsa-utils/files/digest-alsa-utils-1.0.5
@@ -0,0 +1 @@
+MD5 b8e36e0656853467652ab2708aaa3809 alsa-utils-1.0.5.tar.bz2 147408