New release candidate for alsa-driver.

Package-Manager: portage-2.1.3.9

4 files changed, 204 insertions, 8 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index cd9c11d744d2..f38ed16de7c4 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.274 2007/09/08 03:20:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.275 2007/09/17 17:32:37 phreak Exp $
+
+*alsa-driver-1.0.15_rc2 (17 Sep 2007)
+
+  17 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +alsa-driver-1.0.15_rc2.ebuild:
+  New release candidate for alsa-driver.
 
   08 Sep 2007; Joseph Jezak <josejx@gentoo.org> alsa-driver-1.0.14.ebuild:
   Marked ppc/ppc64 for bug #189155.
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 202c25d6ab8c..8f651d363c08 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -18,6 +18,7 @@ DIST alsa-driver-1.0.14.tar.bz2 2600096 RMD160 2d017ed11bd037e450ffa969602f84cc1
 DIST alsa-driver-1.0.14rc1.tar.bz2 2515938 RMD160 83f18e77bcd28e1eaccd66967de0dab0bfa84106 SHA1 2f815ac95c47eabf18c5ba0d0b1094249a5a5965 SHA256 09318cc3cc5bcf2eb69c1d75e2e045f625b8756d4879e5c2c0a1f3951524766d
 DIST alsa-driver-1.0.14rc2.tar.bz2 2525315 RMD160 cdaadd027d7be5a71e4fe281efcbbd9b64f7b892 SHA1 6a8fcab92e64da092aa0f566e13d1634b1ed1d2a SHA256 67e0f2ab476c0f08c642b33e4f57b17311fa07fd56eb3a02c76df22738f6d387
 DIST alsa-driver-1.0.14rc3.tar.bz2 2528674 RMD160 10c8d191079e9d7bfb37c71cbc8a2c509fd6423b SHA1 71836d8b08083028d48ae6f4d6792f78cce69fb4 SHA256 b7b99936bb118c0b808a386795625946e04841d24758e4c61370165e50999fc1
+DIST alsa-driver-1.0.15rc2.tar.bz2 2672586 RMD160 d77bd70d5bcef9b88fcd199bbc435ba2c7d451e4 SHA1 de0dc4cfbc39f0c58371b0e741a5f36ef6b3bfa2 SHA256 e3d2d001c070077b84de46bb0256bc999ce41e451815b00e4b7f4f4633c4425d
 EBUILD alsa-driver-1.0.13.ebuild 5053 RMD160 b545351412e7222692d3e4746ff23fc29377a32a SHA1 f668e49b173072584426e4e22f94b0a8eb92da63 SHA256 1f85e1013ebc73b71be96b2e0b9c78aa81a466d8d188483e43591bf84e513821
 MD5 76be0e2298225b626343ad9c17d672ca alsa-driver-1.0.13.ebuild 5053
 RMD160 b545351412e7222692d3e4746ff23fc29377a32a alsa-driver-1.0.13.ebuild 5053
@@ -42,14 +43,18 @@ EBUILD alsa-driver-1.0.14_rc3.ebuild 7003 RMD160 060fc6cea9e90c0ce1fb38013418090
 MD5 d110d7edc6f7cdd9db7f4e5730937708 alsa-driver-1.0.14_rc3.ebuild 7003
 RMD160 060fc6cea9e90c0ce1fb380134180905b6c867a4 alsa-driver-1.0.14_rc3.ebuild 7003
 SHA256 27018b18e59295783f6bf8567c21738ef5a4c9e33649a38e6c7e736fae9cd37a alsa-driver-1.0.14_rc3.ebuild 7003
+EBUILD alsa-driver-1.0.15_rc2.ebuild 6977 RMD160 b2ce63617ff44a167a419fd9a6eaee208d89346c SHA1 b8a224455fb340dd4189b36081f4ff29b1c47bad SHA256 03bb8553f68ba39cc84bbde557492c8a74338ea914ef5cac5cd7ad512242288f
+MD5 57dce5ff69667643df0ebbe880f624bf alsa-driver-1.0.15_rc2.ebuild 6977
+RMD160 b2ce63617ff44a167a419fd9a6eaee208d89346c alsa-driver-1.0.15_rc2.ebuild 6977
+SHA256 03bb8553f68ba39cc84bbde557492c8a74338ea914ef5cac5cd7ad512242288f alsa-driver-1.0.15_rc2.ebuild 6977
 EBUILD alsa-driver-9999.ebuild 6607 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 SHA1 552bd47dee56891409036e2b1812c972980906d8 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22
 MD5 a848bdd54e898bd3a9328968f56e236c alsa-driver-9999.ebuild 6607
 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 alsa-driver-9999.ebuild 6607
 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22 alsa-driver-9999.ebuild 6607
-MISC ChangeLog 47284 RMD160 b9636f4ff05fa71b998bc530b4d3c7daaee29e76 SHA1 03620fc51a3ae0f43c921d298252fcdea75f1a32 SHA256 badaa5ab913be03026b62b7565733f4187200ef0d658bc7259ac6c3c485483b0
-MD5 d6d0aaaed5195a453ee788e5cf962f7a ChangeLog 47284
-RMD160 b9636f4ff05fa71b998bc530b4d3c7daaee29e76 ChangeLog 47284
-SHA256 badaa5ab913be03026b62b7565733f4187200ef0d658bc7259ac6c3c485483b0 ChangeLog 47284
+MISC ChangeLog 47449 RMD160 96ce00f1ff6c269c1680c9b6f3f1000fe2bee2ec SHA1 a5217c63f52e4825e9067408b3d53077ff48b932 SHA256 5c64b756d5b2a94b0d16aa1f8e67363ed8507632919c7998af7c6db0feb1d0a9
+MD5 8cd44e7434eeb5dd5cb45a6abae8b5d4 ChangeLog 47449
+RMD160 96ce00f1ff6c269c1680c9b6f3f1000fe2bee2ec ChangeLog 47449
+SHA256 5c64b756d5b2a94b0d16aa1f8e67363ed8507632919c7998af7c6db0feb1d0a9 ChangeLog 47449
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -72,13 +77,16 @@ SHA256 d7667fa4285fd5bdb4cad4e4a885c4b7ee98ae60ce9318a4369fc9adaa24096f files/di
 MD5 22d569e5fc052ab62ea76cfc4076f386 files/digest-alsa-driver-1.0.14_rc3 271
 RMD160 733a3c1dde2e1351ce5ea0eee3d463cdb5721196 files/digest-alsa-driver-1.0.14_rc3 271
 SHA256 4d00b45f4a13e2dd77d80cee737cb995f60d7870d98ac8e6cb845be2eb183ced files/digest-alsa-driver-1.0.14_rc3 271
+MD5 309cb5a9b0a770960fa8266b5a113970 files/digest-alsa-driver-1.0.15_rc2 271
+RMD160 5e490cac01d5b68643a9989b6ec125404c73b237 files/digest-alsa-driver-1.0.15_rc2 271
+SHA256 7dfcf09e8f2720b9bc8a6712152c874b90aa95b78b2c000a5f400b4ee883b7db files/digest-alsa-driver-1.0.15_rc2 271
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-alsa-driver-9999 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-alsa-driver-9999 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-alsa-driver-9999 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG4hVOcsIHjyDViGQRAnawAJsHRbqOFvVHHhGG29ANnmftJabJ5ACgjaK+
-KHMeI7q/5/ExPOYGEsm7LhQ=
-=HNSp
+iD8DBQFG7rpCyuNVb5qfaOYRAgsIAJ9BMMlWdjuKJ22UYUophrr0yp34eACdHyPV
+Gc0I3jMIui/ySnpY9YliOvA=
+=0D8a
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild
new file mode 100644
index 000000000000..cd8a94a36b6f
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.15_rc2.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2007 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.15_rc2.ebuild,v 1.1 2007/09/17 17:32:37 phreak Exp $
+
+inherit autotools 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/"
+
+if [[ ${MY_P} == ${MY_P/_p*/} ]]; then
+	SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+else # Gentoo snapshots
+	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss debug midi"
+
+IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401
+loopback portman2x4 pcsp ad1848-lib cs4231-lib adlib ad1816a ad1848
+als100 azt2320 cmi8330 cs4231 cs4232 cs4236 dt019x es968 es1688 es18xx
+gusclassic gusextreme gusmax interwave interwave-stb opl3sa2
+opti92x-ad1848 opti92x-cs4231 opti93x miro sb8 sb16 sbawe sgalaxy
+sscape wavefront pc98-cs4232 msnd-pinnacle ad1889 als300 als4000
+ali5451 atiixp atiixp-modem au8810 au8820 au8830 azt3328 bt87x ca0106
+cmipci cs4281 cs46xx cs5535audio darla20 gina20 layla20 darla24 gina24
+layla24 mona mia echo3g indigo indigoio indigodj emu10k1 emu10k1x
+ens1370 ens1371 es1938 es1968 fm801 fm801-tea575x hda-intel hdsp hdspm
+ice1712 ice1724 intel8x0 intel8x0m korg1212 maestro3 mixart nm256
+pcxhr riptide rme32 rme96 rme9652 sonicvibes trident via82xx
+via82xx-modem vx222 ymfpci pdplus asihpi powermac aoa
+aoa-fabric-layout aoa-onyx aoa-tas aoa-toonie aoa-soundbus
+aoa-soundbus-i2s sa11xx-uda1341 armaaci s3c2410 pxa2xx-i2sound au1x00
+usb-audio usb-usx2y vxpocket pdaudiocf sun-amd7930 sun-cs4231 sun-dbri
+harmony soc at91-soc at91-soc-eti-b1-wm8731 pxa2xx-soc
+pxa2xx-soc-corgi pxa2xx-soc-spitz pxa2xx-soc-poodle pxa2xx-soc-tosa"
+
+for iuse_card in ${IUSE_CARDS}; do
+	IUSE="${IUSE} alsa_cards_${iuse_card}"
+done
+
+RDEPEND="virtual/modutils
+	 !media-sound/snd-aoa"
+DEPEND="${RDEPEND}
+	>=media-sound/alsa-headers-1.0.14
+	virtual/linux-sources
+	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:-${IUSE_ALSA_CARDS}}
+
+	local PNP_DRIVERS="interwave interwave-stb"
+	local PNP_ERROR="Some of the drivers you selected require PnP support in your kernel (${PNP_DRIVERS}). Either enable PnP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local ISA_DRIVERS="cs4232 msnd-pinnacle cs4231-lib adlib ad1816a ad1848 als100 azt2320
+		cmi8330 cs4231 cs4236 dt019x  es968 es1688 es18xx gusclassic gusextreme gusmax
+		interwave interwave-stb opl3sa2 opti92x-ad1848 opti92x-cs4231 opti93x miro sb8
+		sb16 sbawe sb16_csp sgalaxy sscape wavefront"
+	local ISA_ERROR="Some of the drivers you selected require ISA support in your kernel ($(echo $ISA_DRIVERS)). Either enable ISA in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local FW_DRIVERS="darla20 gina20 layla20 darla24 gina24 layla24 mona mia echo3g indigo
+		indigoio indigodj emu10k1 korg1212 maestro3 riptide ymfpci asihpi"
+	local FW_LOADER_ERROR="Some of the drivers you selected require 'Userspace firmware loading support' in your kernel (${FW_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local PARPORT_DRIVERS="portman2x4"
+	local PARPORT_ERROR="Some if the drivers you selected require Parallel Port support (${PARPORT_DRIVERS}). Either enable that feature or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf."
+
+	local TMP_ALSA_CARDS
+	local CHECK_PNP
+	local CHECK_ISA
+	local CHECK_FW
+	local CHECK_PARPORT
+	for card in ${ALSA_CARDS}; do
+		if has alsa_cards_${card} ${IUSE} && use alsa_cards_${card}; then
+			TMP_ALSA_CARDS="${TMP_ALSA_CARDS} ${card}"
+			has ${card} ${PNP_DRIVERS} && CHECK_PNP="PNP"
+			has ${card} ${ISA_DRIVERS} && CHECK_ISA="ISA"
+			has ${card} ${FW_DRIVERS} && CHECK_FW="FW_LOADER"
+			has ${card} ${PARPORT_DRIVERS} && CHECK_PARPORT="PARPORT"
+		fi
+	done
+	ALSA_CARDS="${TMP_ALSA_CARDS}"
+
+	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW} ${CHECK_PARPORT}"
+	local SND_ERROR="ALSA is already compiled into the kernel. This is the recommended configuration, don't emerge alsa-driver."
+	local SOUND_ERROR="Your kernel doesn't have sound support enabled."
+	local SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers.	 Please disable them and re-emerge alsa-driver."
+
+	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}"
+
+	convert_to_m "${S}/Makefile"
+	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
+	eautoconf
+}
+
+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 \
+		$(use_with midi sequencer) \
+		--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}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-modules || die "make install failed"
+
+	dodoc CARDS-STATUS FAQ README WARNING TODO
+
+	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() {
+	elog
+	elog "Remember that all mixer channels will be MUTED by default."
+	elog "Use the 'alsamixer' program to unmute them, then save your"
+	elog "mixer settings with /etc/init.d/alsasound save"
+	elog
+	elog "If you experience problems, please try building the in-kernel"
+	elog "ALSA drivers instead. This ebuild is not recommended and is"
+	elog "likely to be removed from portage at a later date."
+	elog
+
+	linux-mod_pkg_postinst
+
+	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
+
+		find "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" -type d -print0 | xargs --null rmdir
+	fi
+}
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2
new file mode 100644
index 000000000000..6608c5c8b027
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.15_rc2
@@ -0,0 +1,3 @@
+MD5 638aa4159fae5cf1693c60952b246328 alsa-driver-1.0.15rc2.tar.bz2 2672586
+RMD160 d77bd70d5bcef9b88fcd199bbc435ba2c7d451e4 alsa-driver-1.0.15rc2.tar.bz2 2672586
+SHA256 e3d2d001c070077b84de46bb0256bc999ce41e451815b00e4b7f4f4633c4425d alsa-driver-1.0.15rc2.tar.bz2 2672586