From 980b73b12883203a6a4e0faa9b2df4096c4f9083 Mon Sep 17 00:00:00 2001 From: Steve Dibb Date: Sun, 6 Jun 2010 00:59:52 +0000 Subject: Version bump, bug 308677; Drop fm801-tea575x, bug 308679 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- media-sound/alsa-driver/ChangeLog | 8 +- media-sound/alsa-driver/Manifest | 6 +- media-sound/alsa-driver/alsa-driver-1.0.23.ebuild | 187 ++++++++++++++++++++++ media-sound/alsa-driver/alsa-driver-9999.ebuild | 4 +- 4 files changed, 200 insertions(+), 5 deletions(-) create mode 100644 media-sound/alsa-driver/alsa-driver-1.0.23.ebuild (limited to 'media-sound/alsa-driver') diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog index 8515cbd09eb9..be9d607718df 100644 --- a/media-sound/alsa-driver/ChangeLog +++ b/media-sound/alsa-driver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/alsa-driver # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.307 2010/04/17 16:46:01 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.308 2010/06/06 00:59:52 beandog Exp $ + +*alsa-driver-1.0.23 (06 Jun 2010) + + 06 Jun 2010; Steve Dibb +alsa-driver-1.0.23.ebuild, + alsa-driver-9999.ebuild: + Version bump, bug 308677; Drop fm801-tea575x, bug 308679 17 Apr 2010; Lars Wendler alsa-driver-1.0.22.1.ebuild, alsa-driver-9999.ebuild: diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest index 445f86e360b1..c2394d1ddbc9 100644 --- a/media-sound/alsa-driver/Manifest +++ b/media-sound/alsa-driver/Manifest @@ -1,5 +1,7 @@ DIST alsa-driver-1.0.22.1.tar.bz2 3218678 RMD160 ad139cf0b4769f0a27afd0aa4d91cb808d43a589 SHA1 603f0caff5307c68be4d941c841d892e376e4ae9 SHA256 2c69f4fa72f55e85f32db696f3a6497642ebfe1204ca8f30d328f177176c6782 +DIST alsa-driver-1.0.23.tar.bz2 3337645 RMD160 bdefa689616bd6b21e75837f4ee4afc4d7bd4583 SHA1 b7d376cd3e664ba13b6dfb8278546f1b61189a14 SHA256 0641da5be2de9ca2fa1b234d479063280238290e253a94492c87c573bf445f22 EBUILD alsa-driver-1.0.22.1.ebuild 7324 RMD160 b8be882eac6bd719de2057d47033d56c1b5be063 SHA1 10d857fd9a56dbb278653fa5f5aa3872a81c568f SHA256 3969466258d9c25fbf67bf6a8d35de2beb45fde1b574e0452655257e360117eb -EBUILD alsa-driver-9999.ebuild 7076 RMD160 4361e1c76eee86919d67e67ce2ad06f788422690 SHA1 2d5156fd3f443711f78785e169ce232aeace879f SHA256 c73cde9bfb169a1d10381fd3adc3a5c2fe2aad08e1fdb4b76b86d5010b646bff -MISC ChangeLog 52556 RMD160 09d5dcb0f492d984708c2e0104f52a9881652072 SHA1 ccbe089e395c763fdbfba831d328349db3f2143e SHA256 c56f663155dfa075194776c58c49d059577e80a912322d4fed6900f12ef291e8 +EBUILD alsa-driver-1.0.23.ebuild 7303 RMD160 a8a4cfb5d00deef224e4d59565b6d4a8fb9d3d07 SHA1 a3a9c5d291e5d3b7a87c8380227a8b89a00b9842 SHA256 fb3117d0919dfeb8ac958465e8e34d1282821222c097531c35c47200294f31ac +EBUILD alsa-driver-9999.ebuild 7057 RMD160 98471c89b7e670d226c899ffbc062e2fd4ef016a SHA1 d38c0f7898cf0ae487b319fa8c5907f7fb56f385 SHA256 c072cb66f20b88c04670c401829aacaa188a554f993a266db20ae4e1e8f61b5e +MISC ChangeLog 52748 RMD160 2fe9caa7d4a3739e479bce1b79590edc47a957c1 SHA1 fb9de4ce0abde77e702e98a6f9346e6c16f70adf SHA256 a2ce5b84ed18743308b7acd7c81767c2427e913699a88945b4208a91d3490287 MISC metadata.xml 231 RMD160 24abe9408b4c6e5156b661d0889c57f7b341bd6f SHA1 bac14117a40aabff9dfd27f2a8ff55d9071c8265 SHA256 34105d33263c918eca8ca9f6dc9aeec9008cb2349196d130d77f66610abcf701 diff --git a/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild new file mode 100644 index 000000000000..4e7abbe45829 --- /dev/null +++ b/media-sound/alsa-driver/alsa-driver-1.0.23.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2010 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.23.ebuild,v 1.1 2010/06/06 00:59:52 beandog 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" +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86" +IUSE="oss debug" + +IUSE_CARDS="hrtimer rtctimer hpet pcsp seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401 +loopback portman2x4 ad1848-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 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 usb-us122l 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 hifier +ml403-ac97cr oxygen pxa2xx-soc-e800 sis7019 virtuoso" + +for iuse_card in ${IUSE_CARDS}; do + IUSE="${IUSE} alsa_cards_${iuse_card}" +done + +RDEPEND="virtual/modutils" +DEPEND="${RDEPEND} + >=media-sound/alsa-headers-1.0.21 + 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 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." + + if use oss && kernel_is -ge 2 6 28 ; then + local CONFIG_CHECK+="SOUND_PRIME" + local SOUND_PRIME_ERROR="You enabled oss USE flag but your kernel's soundcore module lacks support of the proper functions. Please enable CONFIG_SOUND_PRIME and re-emerge alsa-driver." + fi + + 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 oss pcm-oss-plugins) \ + $(use_with debug debug full) \ + --with-kernel="${KV_DIR}" \ + --with-build="${KV_OUT_DIR}" \ + --with-redhat=no \ + --with-suse=no \ + --with-isapnp=auto \ + --with-sequencer \ + --with-cards="${ALSA_CARDS}" \ + --with-card-options=all || 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 SUPPORTED_KERNELS + + 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 unsupported." + 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/alsa-driver-9999.ebuild b/media-sound/alsa-driver/alsa-driver-9999.ebuild index fdfbe81c0d3c..becac90bc210 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-2010 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.14 2010/04/17 16:46:01 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-9999.ebuild,v 1.15 2010/06/06 00:59:52 beandog Exp $ inherit linux-mod flag-o-matic eutils multilib autotools git @@ -22,7 +22,7 @@ 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 +ens1370 ens1371 es1938 es1968 fm801 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 -- cgit v1.2.3-65-gdbad