Added SNDRV_DMA_TYPE_PCI to SNDRV_DMA_TYPE_DEV fixes.

5 files changed, 186 insertions, 1 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 7207535e5b78..a5644aadc7fc 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.80 2004/04/08 07:44:16 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.81 2004/04/08 18:42:45 eradicator Exp $
+
+*alsa-driver-1.0.4-r1 (08 Apr 2004)
+
+  08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  alsa-driver-1.0.4-r1.ebuild, files/alsa-driver-1.0.4-devfix.patch:
+  Added SNDRV_DMA_TYPE_PCI to SNDRV_DMA_TYPE_DEV fixes.
 
   08 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 02807272a4e9..b1020a208f0b 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -1,6 +1,7 @@
 MD5 d846a567c35f2f6de11d0969ca7e51d5 alsa-driver-0.5.12a.ebuild 1633
 MD5 85d61c1e5013df6d9214a79bbfec56a7 alsa-driver-0.9.2.ebuild 2667
 MD5 469bfd04ec1dc8a49bed4be17b24d7db alsa-driver-1.0.4.ebuild 3317
+MD5 2373bcebc68f6ffb882a866fb955146a alsa-driver-1.0.4-r1.ebuild 3372
 MD5 2c3d8e8ee062ea5667b436384d4277eb alsa-driver-1.0.3.ebuild 3366
 MD5 1889d92f4294e088989fddf9e4b4a5f2 ChangeLog 14200
 MD5 977252129edb014d00f4bf5421f54724 alsa-driver-1.0.2c.ebuild 2686
@@ -17,7 +18,9 @@ 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 c258ec47bd008c5284ca3acab4483f41 files/alsa-driver-1.0.4-devfix.patch 4673
 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
+MD5 22c91af2bd37ea657699d07e80d109c3 files/digest-alsa-driver-1.0.4-r1 71
 MD5 28ae6bb0823279c56f378d7ac6d6f607 files/alsasound 4608
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.4-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..7434b238c495
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.4-r1.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.4-r1.ebuild,v 1.1 2004/04/08 18:42:45 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}"
+
+	# 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.4-devfix.patch b/media-sound/alsa-driver/files/alsa-driver-1.0.4-devfix.patch
new file mode 100644
index 000000000000..48b61862637f
--- /dev/null
+++ b/media-sound/alsa-driver/files/alsa-driver-1.0.4-devfix.patch
@@ -0,0 +1,59 @@
+diff -Naur alsa-driver-1.0.4/alsa-kernel/include/trident.h alsa-driver-1.0.4.devfix/alsa-kernel/include/trident.h
+--- alsa-driver-1.0.4/alsa-kernel/include/trident.h	2004-03-02 07:32:36.000000000 -0800
++++ alsa-driver-1.0.4.devfix/alsa-kernel/include/trident.h	2004-04-08 10:04:53.000000000 -0700
+@@ -56,9 +56,9 @@
+ 
+ /* Trident chipsets have 1GB memory limit */
+ #ifdef __alpha__
+-#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI_16MB
++#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV_16MB
+ #else
+-#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI
++#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV
+ #endif
+ 
+ #define SNDRV_SEQ_DEV_ID_TRIDENT			"trident-synth"
+diff -Naur alsa-driver-1.0.4/alsa-kernel/isa/cs423x/cs4231_lib.c alsa-driver-1.0.4.devfix/alsa-kernel/isa/cs423x/cs4231_lib.c
+--- alsa-driver-1.0.4/alsa-kernel/isa/cs423x/cs4231_lib.c	2004-03-06 08:51:29.000000000 -0800
++++ alsa-driver-1.0.4.devfix/alsa-kernel/isa/cs423x/cs4231_lib.c	2004-04-08 10:04:53.000000000 -0700
+@@ -1659,7 +1659,7 @@
+ #else
+ #  ifdef EBUS_SUPPORT
+         if (chip->ebus_flag) {
+-                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,
++                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                 				      chip->dev_u.pdev,
+ 						      64*1024, 128*1024);
+         } else {
+diff -Naur alsa-driver-1.0.4/alsa-kernel/parisc/harmony.c alsa-driver-1.0.4.devfix/alsa-kernel/parisc/harmony.c
+--- alsa-driver-1.0.4/alsa-kernel/parisc/harmony.c	2004-03-17 03:14:12.000000000 -0800
++++ alsa-driver-1.0.4.devfix/alsa-kernel/parisc/harmony.c	2004-04-08 10:04:53.000000000 -0700
+@@ -847,7 +847,7 @@
+ 	harmony->pcm = pcm;
+ 	
+ 	/* initialize graveyard buffer */
+-	harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;
++	harmony->dma_dev.type = SNDRV_DMA_TYPE_DEV;
+ 	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev); 
+ 	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,
+ 			HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);
+diff -Naur alsa-driver-1.0.4/hal2/hal2.c alsa-driver-1.0.4.devfix/hal2/hal2.c
+--- alsa-driver-1.0.4/hal2/hal2.c	2002-10-21 11:53:22.000000000 -0700
++++ alsa-driver-1.0.4.devfix/hal2/hal2.c	2004-04-08 10:04:53.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.4-r1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4-r1
new file mode 100644
index 000000000000..d70af40d079b
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.4-r1
@@ -0,0 +1 @@
+MD5 30684fbfcc84633df9740ab3f8e6bc97 alsa-driver-1.0.4.tar.bz2 1717290