Make MIDI sequencer support optional on midi useflag, thanks to Sascha Geschwandtner in bug #163513 for reporting.

Package-Manager: portage-2.1.2-r5

5 files changed, 202 insertions, 15 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index 5bda39602f50..ddc11461f469 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.259 2007/01/27 20:53:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.260 2007/01/30 00:34:06 flameeyes Exp $
+
+*alsa-driver-1.0.14_rc2-r1 (30 Jan 2007)
+
+  30 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.14_rc2-r1.ebuild, alsa-driver-9999.ebuild:
+  Make MIDI sequencer support optional on midi useflag, thanks to Sascha
+  Geschwandtner in bug #163513 for reporting.
 
   27 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   alsa-driver-1.0.14_rc2.ebuild, alsa-driver-9999.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index b88eddb73313..f0046e8f8456 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -20,18 +20,22 @@ EBUILD alsa-driver-1.0.14_rc1.ebuild 6455 RMD160 f9c84b5478044e8f418d96f9c4cfdf2
 MD5 030d3fb68993970d295c196b6394aee3 alsa-driver-1.0.14_rc1.ebuild 6455
 RMD160 f9c84b5478044e8f418d96f9c4cfdf2c21ad66a8 alsa-driver-1.0.14_rc1.ebuild 6455
 SHA256 d0f5af36cb7f584a20a026bfcd0f01f96f06814fde24844a0afa3f3215ff8ba1 alsa-driver-1.0.14_rc1.ebuild 6455
+EBUILD alsa-driver-1.0.14_rc2-r1.ebuild 6521 RMD160 d43cff3e9996000c14a4f3acfb9b66dd5b9059de SHA1 6b2cd0b918203322d621498ced0fed5ac22a533f SHA256 880bec0cb0c54fe2ecae6fcfc91a2bf5129ea45cc23e7814bc2902a53716d065
+MD5 04cd274f55afc33bd24d87ed6f194b15 alsa-driver-1.0.14_rc2-r1.ebuild 6521
+RMD160 d43cff3e9996000c14a4f3acfb9b66dd5b9059de alsa-driver-1.0.14_rc2-r1.ebuild 6521
+SHA256 880bec0cb0c54fe2ecae6fcfc91a2bf5129ea45cc23e7814bc2902a53716d065 alsa-driver-1.0.14_rc2-r1.ebuild 6521
 EBUILD alsa-driver-1.0.14_rc2.ebuild 6507 RMD160 16f9b4af043d9c0f0d5693ded3ccd54f444e1b9b SHA1 8e6a5e44c68e983e7146889bf1aef83133fc201f SHA256 7cfb149360b8e3702bc66fceead0cd56e40e08343ddf4a4230ed04a18f5b0a29
 MD5 cd2b0575c4493ca5942d79c790333703 alsa-driver-1.0.14_rc2.ebuild 6507
 RMD160 16f9b4af043d9c0f0d5693ded3ccd54f444e1b9b alsa-driver-1.0.14_rc2.ebuild 6507
 SHA256 7cfb149360b8e3702bc66fceead0cd56e40e08343ddf4a4230ed04a18f5b0a29 alsa-driver-1.0.14_rc2.ebuild 6507
-EBUILD alsa-driver-9999.ebuild 6597 RMD160 8c56333e1579003505ef951069d5cfb44851f8da SHA1 6389a5b332fa4d64f54f9d33d452e4aed4530ca2 SHA256 66f65e41a89a2711f166b3f302dd59ebda386903e7b922b13e771a62468c8409
-MD5 5095e905b5704e7572491ea686cab5f0 alsa-driver-9999.ebuild 6597
-RMD160 8c56333e1579003505ef951069d5cfb44851f8da alsa-driver-9999.ebuild 6597
-SHA256 66f65e41a89a2711f166b3f302dd59ebda386903e7b922b13e771a62468c8409 alsa-driver-9999.ebuild 6597
-MISC ChangeLog 45052 RMD160 fb274dbf6c46ea35fbb3f75e2d35a8e99a79fb1f SHA1 750a96f517783d6c08fe884d1a34961f308d71fb SHA256 b94b8aa4acd4438e903c445bbe8a878e6e5dd8add687e54af773203bea6fdccc
-MD5 c77dead6a164778a3f92c18b23286443 ChangeLog 45052
-RMD160 fb274dbf6c46ea35fbb3f75e2d35a8e99a79fb1f ChangeLog 45052
-SHA256 b94b8aa4acd4438e903c445bbe8a878e6e5dd8add687e54af773203bea6fdccc ChangeLog 45052
+EBUILD alsa-driver-9999.ebuild 6608 RMD160 b5c7bbf0633f855bc03a6bcbb45030a247f6479f SHA1 fae51cb3405aa57d0fa2e4b03144b90bf2af69f1 SHA256 43efef148f2adf3f0371e91672f8dcd41c1544b13dfb0cdfc9250c4ec3b6315f
+MD5 ed99909810cb40c34681323c8eaaa151 alsa-driver-9999.ebuild 6608
+RMD160 b5c7bbf0633f855bc03a6bcbb45030a247f6479f alsa-driver-9999.ebuild 6608
+SHA256 43efef148f2adf3f0371e91672f8dcd41c1544b13dfb0cdfc9250c4ec3b6315f alsa-driver-9999.ebuild 6608
+MISC ChangeLog 45329 RMD160 da685f2d70be32c7e43933ae68438471b16e22d8 SHA1 ae488fd327db7b651c6dc8d29fe2a7ef34addadb SHA256 11d631e60fa251ee75d1448ad433a3dab541353acd2e4772a1454fba508b05e1
+MD5 3985c828010750c90cd2162b67aa4d72 ChangeLog 45329
+RMD160 da685f2d70be32c7e43933ae68438471b16e22d8 ChangeLog 45329
+SHA256 11d631e60fa251ee75d1448ad433a3dab541353acd2e4772a1454fba508b05e1 ChangeLog 45329
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -45,13 +49,16 @@ SHA256 2fcc9c3a03d7cb5056f3254204a82ed8d48ff5c5c58a8447ebeeb609654fb4c8 files/di
 MD5 26388b148994892870e7470f49e7f65b files/digest-alsa-driver-1.0.14_rc2 271
 RMD160 043f495a65155836673089b1a40f3acf4347bfee files/digest-alsa-driver-1.0.14_rc2 271
 SHA256 d7667fa4285fd5bdb4cad4e4a885c4b7ee98ae60ce9318a4369fc9adaa24096f files/digest-alsa-driver-1.0.14_rc2 271
+MD5 26388b148994892870e7470f49e7f65b files/digest-alsa-driver-1.0.14_rc2-r1 271
+RMD160 043f495a65155836673089b1a40f3acf4347bfee files/digest-alsa-driver-1.0.14_rc2-r1 271
+SHA256 d7667fa4285fd5bdb4cad4e4a885c4b7ee98ae60ce9318a4369fc9adaa24096f files/digest-alsa-driver-1.0.14_rc2-r1 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.1 (GNU/Linux)
 
-iD8DBQFFu7vaAiZjviIA2XgRAheuAJ4lbvaGyzmj6oJxrijAGfSUqScOfwCdEz+T
-9fsssv2IxlEMjG1yt1o2dok=
-=cjui
+iD8DBQFFvpKVAiZjviIA2XgRAmKIAJ9Li8b4EWzGlFbkCVP6rlQ9zjjdtQCg7GWN
+NQ4c50OX9/Rul5851OXbQXs=
+=dU+T
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2-r1.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2-r1.ebuild
new file mode 100644
index 000000000000..2d3bb443fa12
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2-r1.ebuild
@@ -0,0 +1,170 @@
+# 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.14_rc2-r1.ebuild,v 1.1 2007/01/30 00:34:06 flameeyes Exp $
+
+inherit 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/"
+SRC_URI="mirror://alsaproject/driver/${MY_P}.tar.bz2"
+
+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-${PV}
+	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 TMP_ALSA_CARDS
+	local CHECK_PNP
+	local CHECK_ISA
+	local CHECK_FW
+	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"
+		fi
+	done
+	ALSA_CARDS="${TMP_ALSA_CARDS}"
+
+	local CONFIG_CHECK="!SND SOUND ${CHECK_PNP} ${CHECK_ISA} ${CHECK_FW}"
+	local SND_ERROR="ALSA is already compiled into the kernel."
+	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}"
+
+	epatch "${FILESDIR}/${P}-tumbler-ppc.patch"
+
+	convert_to_m "${S}/Makefile"
+	sed -i -e 's:\(.*depmod\):#\1:' "${S}/Makefile"
+}
+
+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 "The alsasound initscript and modules.d/alsa have now moved to alsa-utils"
+	elog
+	elog "Also, remember that all mixer channels will be MUTED by default."
+	elog "Use the 'alsamixer' program to unmute them."
+	elog
+	elog "If you experience problems, please report bugs to http://bugs.gentoo.org."
+	elog
+
+	linux-mod_pkg_postinst
+
+	elog "Check out the ALSA installation guide availible at the following URL:"
+	elog "http://www.gentoo.org/doc/en/alsa-guide.xml"
+
+	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 rmdir
+	fi
+}
diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild
index e7e9c8f9dfe2..6263fadb9d6b 100644
--- a/media-sound/alsa-driver/alsa-driver-9999.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.7 2007/01/27 20:53:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.8 2007/01/30 00:34:06 flameeyes Exp $
 
 inherit linux-mod flag-o-matic eutils multilib autotools mercurial
 
@@ -11,7 +11,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
 KEYWORDS=""
-IUSE="oss debug"
+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
@@ -120,7 +120,7 @@ src_compile() {
 		--with-kernel="${KV_DIR}" \
 		--with-build="${KV_OUT_DIR}" \
 		--with-isapnp=yes \
-		--with-sequencer=yes \
+		$(use_with midi sequencer) \
 		--with-cards="${ALSA_CARDS}" || die "econf failed"
 
 	# linux-mod_src_compile doesn't work well with alsa
diff --git a/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_rc2-r1 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_rc2-r1
new file mode 100644
index 000000000000..ad9930a12fae
--- /dev/null
+++ b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_rc2-r1
@@ -0,0 +1,3 @@
+MD5 b1d0d43a05ea5c2f7d06a9c5a471a4a1 alsa-driver-1.0.14rc2.tar.bz2 2525315
+RMD160 cdaadd027d7be5a71e4fe281efcbbd9b64f7b892 alsa-driver-1.0.14rc2.tar.bz2 2525315
+SHA256 67e0f2ab476c0f08c642b33e4f57b17311fa07fd56eb3a02c76df22738f6d387 alsa-driver-1.0.14rc2.tar.bz2 2525315