From: Petteri Räty Date: Mon, 8 Jan 2007 11:12:57 +0000 (+0000) Subject: Merged changes from 1.0.14_rc1. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5946995588a2ea2ff1b6959ae607a4ef8d2ad98e;p=gentoo.git Merged changes from 1.0.14_rc1. Package-Manager: portage-2.1.2_rc4-r5 --- diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 88249d57c256..5ba67bea26d4 100644 --- a/media-sound/alsa-driver/ChangeLog +++ b/media-sound/alsa-driver/ChangeLog @@ -1,6 +1,10 @@ # 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.252 2007/01/06 20:12:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.253 2007/01/08 11:12:57 betelgeuse Exp $ + + 08 Jan 2007; Petteri Räty + alsa-driver-9999.ebuild: + Merged changes from 1.0.14_rc1. 06 Jan 2007; Diego Pettenò alsa-driver-9999.ebuild: diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index ed910fc3bb75..3567646e9311 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -15,14 +15,14 @@ EBUILD alsa-driver-1.0.14_rc1.ebuild 6456 RMD160 2c9506edfd0975ce8f3bde5fcf236d6 MD5 b6daad53196952a2f63ad46a72562fc9 alsa-driver-1.0.14_rc1.ebuild 6456 RMD160 2c9506edfd0975ce8f3bde5fcf236d6c25ebc603 alsa-driver-1.0.14_rc1.ebuild 6456 SHA256 3d29cc2557ebd6e62cde92d947ce4aba542a2148e4b8e71c4e632d4ce1df4ebf alsa-driver-1.0.14_rc1.ebuild 6456 -EBUILD alsa-driver-9999.ebuild 4869 RMD160 bdd738f6c40864caa4285fea39883b0b078f3630 SHA1 eed365b91e58fe27a861c9a569ce61f598aebc41 SHA256 191ecffa5148149dac2c989db973fff0276c7bd7d9cc159ba4e6352c4f2d96c7 -MD5 c368f2e6b4cf59a174098088974253a4 alsa-driver-9999.ebuild 4869 -RMD160 bdd738f6c40864caa4285fea39883b0b078f3630 alsa-driver-9999.ebuild 4869 -SHA256 191ecffa5148149dac2c989db973fff0276c7bd7d9cc159ba4e6352c4f2d96c7 alsa-driver-9999.ebuild 4869 -MISC ChangeLog 43987 RMD160 305f92774de0a7df16b3bc98a28600ac9b5bef4f SHA1 484f0b98da6bcb97c5b3c35977dd0a59bb1691fe SHA256 3af8cbb39bf00cac180131715dcb75526e2fb7582c112f65f9eb3b6857ea9f8f -MD5 bdda0542d55f5568cd3d8d18893943ae ChangeLog 43987 -RMD160 305f92774de0a7df16b3bc98a28600ac9b5bef4f ChangeLog 43987 -SHA256 3af8cbb39bf00cac180131715dcb75526e2fb7582c112f65f9eb3b6857ea9f8f ChangeLog 43987 +EBUILD alsa-driver-9999.ebuild 7129 RMD160 3f8320aa67c55d5fa1ad1f1140dbcdc13e1c9b55 SHA1 4cc84a5f39f7ab0d305d9541f147eb3a370bc910 SHA256 5a8b364ec4100060a046767012bf609ddae1552b179b4e2f99d33da362a99bf0 +MD5 60d06e89483c5d9a55f7743062fc49d5 alsa-driver-9999.ebuild 7129 +RMD160 3f8320aa67c55d5fa1ad1f1140dbcdc13e1c9b55 alsa-driver-9999.ebuild 7129 +SHA256 5a8b364ec4100060a046767012bf609ddae1552b179b4e2f99d33da362a99bf0 alsa-driver-9999.ebuild 7129 +MISC ChangeLog 44103 RMD160 6cd570d337585193c9be1517a5190f54dc1eac13 SHA1 67ac79be89973f3a5a8d0986a815d47cf09dac57 SHA256 68ddd6a06d2bf972fa6d99748e801785844ed30685f10ac52caf14006390371b +MD5 669c2ce0fdd4809cce3b8c25866f4235 ChangeLog 44103 +RMD160 6cd570d337585193c9be1517a5190f54dc1eac13 ChangeLog 44103 +SHA256 68ddd6a06d2bf972fa6d99748e801785844ed30685f10ac52caf14006390371b ChangeLog 44103 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220 @@ -37,9 +37,9 @@ 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) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFFoAKtAiZjviIA2XgRAq8oAJ9n4qQGSveagKUC1xTQlOE75BgUXgCgqlPb -XupOTy4tNG+yOXldFxTf32U= -=iICD +iD8DBQFFoidpcxLzpIGCsLQRAmAsAJ9d023QpbfxBX8XQCaAHIi6s0UWywCeLtMb +oeyV36nbYS1AlnBxiTujBQk= +=DRhO -----END PGP SIGNATURE----- diff --git a/media-sound/alsa-driver/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild index 62e4abee7d09..96f3d98df69c 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.4 2007/01/06 20:12:15 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.5 2007/01/08 11:12:57 betelgeuse Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -16,10 +16,30 @@ SLOT="0" KEYWORDS="-*" IUSE="oss doc debug" +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/alsa-headers-${PV} !media-sound/snd-aoa" DEPEND="${RDEPEND} + ~media-sound/alsa-headers-${PV} virtual/linux-sources sys-apps/debianutils" @@ -35,28 +55,40 @@ pkg_setup() { # # env ALSA_CARDS='emu10k1 intel8x0 ens1370' emerge alsa-driver # - ALSA_CARDS=${ALSA_CARDS:-all} + ALSA_CARDS=${ALSA_CARDS:-${IUSE_ALSA_CARDS}} # Which drivers need PNP local PNP_DRIVERS="interwave interwave-stb" - - CONFIG_CHECK="SOUND" - SND_ERROR="ALSA is already compiled into the kernel." - SOUND_ERROR="Your kernel doesn't have sound support enabled." - SOUND_PRIME_ERROR="Your kernel is configured to use the deprecated OSS drivers. Please disable them and re-emerge alsa-driver." - PNP_ERROR="Some of the drivers you selected require PNP in your kernel (${PNP_DRIVERS}). Either enable PNP in your kernel or trim which drivers get compiled using ALSA_CARDS in /etc/make.conf." - - if [[ "${ALSA_CARDS}" == "all" ]]; then - - # Ignore PNP checks for ppc architecture, as PNP can't be enabled there. - if [[ ${ARCH} != "ppc" ]]; then - CONFIG_CHECK="${CONFIG_CHECK} PNP" + 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 - else - for pnpdriver in ${PNP_DRIVERS}; do - hasq ${pnpdriver} ${ALSA_CARDS} && CONFIG_CHECK="${CONFIG_CHECK} PNP" - done - 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 @@ -117,7 +149,7 @@ src_compile() { src_install() { - emake DESTDIR=${D} install-modules || die "make install failed" + emake DESTDIR="${D}" install-modules || die "make install failed" dodoc CARDS-STATUS FAQ README WARNING TODO @@ -136,8 +168,8 @@ src_install() { 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 + mv "${D}/lib/modules/${KV_FULL}/kernel/sound" "${D}/lib/modules/${KV_FULL}/${PN}" + rmdir "${D}/lib/modules/${KV_FULL}/kernel" &> /dev/null fi } @@ -148,7 +180,6 @@ pkg_postinst() { elog "Also, remember that all mixer channels will be MUTED by default." elog "Use the 'alsamixer' program to unmute them." elog - elog "Version 1.0.3 and above should work with version 2.6 kernels." elog "If you experience problems, please report bugs to http://bugs.gentoo.org." elog @@ -157,14 +188,12 @@ 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 + 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 + for file in $(find "${ROOT}/lib/modules/${KV_FULL}/${PN}" -type f); do rm -f ${file//${KV_FULL}\/${PN}/${KV_FULL}\/kernel\/sound} done - for dir in $(find ${ROOT}/lib/modules/${KV_FULL}/kernel/sound -type d | tac); do - rmdir ${dir} &> /dev/null - done + find "${ROOT}/lib/modules/${KV_FULL}/kernel/sound" -type d -print0 | xargs rmdir fi }