Add a new snapshot required for kernel 2.6.20.
authorDiego Elio Pettenò <flameeyes@gentoo.org>
Sun, 4 Feb 2007 23:53:55 +0000 (23:53 +0000)
committerDiego Elio Pettenò <flameeyes@gentoo.org>
Sun, 4 Feb 2007 23:53:55 +0000 (23:53 +0000)
Package-Manager: portage-2.1.2-r7

media-sound/alsa-driver/ChangeLog
media-sound/alsa-driver/alsa-driver-1.0.14_rc2_p3234.ebuild [new file with mode: 0644]
media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_rc2_p3234 [new file with mode: 0644]
media-sound/alsa-headers/ChangeLog
media-sound/alsa-headers/alsa-headers-1.0.14_rc2_p3234.ebuild [new file with mode: 0644]
media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_rc2_p3234 [new file with mode: 0644]

index ddc11461f4692cdd05f09102a49d684a24ff0ce8..54b3d5719621479aa9e569f3281fbce940da8888 100644 (file)
@@ -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.260 2007/01/30 00:34:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.261 2007/02/04 23:53:54 flameeyes Exp $
+
+*alsa-driver-1.0.14_rc2_p3234 (04 Feb 2007)
+
+  04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-driver-1.0.14_rc2_p3234.ebuild:
+  Add a new snapshot required for kernel 2.6.20.
 
 *alsa-driver-1.0.14_rc2-r1 (30 Jan 2007)
 
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.14_rc2_p3234.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.14_rc2_p3234.ebuild
new file mode 100644 (file)
index 0000000..33ab25b
--- /dev/null
@@ -0,0 +1,181 @@
+# 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_p3234.ebuild,v 1.1 2007/02/04 23:53:55 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/"
+
+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-${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 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."
+       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"
+}
+
+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/files/digest-alsa-driver-1.0.14_rc2_p3234 b/media-sound/alsa-driver/files/digest-alsa-driver-1.0.14_rc2_p3234
new file mode 100644 (file)
index 0000000..203b9f3
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 04d6432173163b6142c6ae136ed6ae6a alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640
+RMD160 fd9fbd736d6de586e664ee64b47396428759bb6f alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640
+SHA256 8ecf14c98968dfcda32266dd77fa91b385e8129d13093d966dde55358f49dd10 alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640
index f80cc5bb95f0ead7b508cfe21f7dd2614ef52a45..2e25a4ab0763458a949054ac80ca32f81befdac9 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsa-headers
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.119 2007/01/25 18:53:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/ChangeLog,v 1.120 2007/02/04 23:53:53 flameeyes Exp $
+
+*alsa-headers-1.0.14_rc2_p3234 (04 Feb 2007)
+
+  04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +alsa-headers-1.0.14_rc2_p3234.ebuild:
+  Add a new snapshot required for kernel 2.6.20.
 
   25 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   alsa-headers-9999.ebuild:
diff --git a/media-sound/alsa-headers/alsa-headers-1.0.14_rc2_p3234.ebuild b/media-sound/alsa-headers/alsa-headers-1.0.14_rc2_p3234.ebuild
new file mode 100644 (file)
index 0000000..470563d
--- /dev/null
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-headers/alsa-headers-1.0.14_rc2_p3234.ebuild,v 1.1 2007/02/04 23:53:53 flameeyes Exp $
+
+inherit eutils
+
+MY_PN=${PN/headers/driver}
+MY_P="${MY_PN}-${PV/_rc/rc}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Header files for 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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+RESTRICT="binchecks strip"
+
+# Remove the sound symlink workaround...
+pkg_setup() {
+       if [[ -L "${ROOT}/usr/include/sound" ]]; then
+               rm      "${ROOT}/usr/include/sound"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       epatch "${FILESDIR}/${PN}-1.0.6a-user.patch"
+}
+
+src_compile() { :; }
+
+src_install() {
+       cd "${S}/alsa-kernel/include"
+       insinto /usr/include/sound
+       doins *.h || die "include failed"
+}
diff --git a/media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_rc2_p3234 b/media-sound/alsa-headers/files/digest-alsa-headers-1.0.14_rc2_p3234
new file mode 100644 (file)
index 0000000..203b9f3
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 04d6432173163b6142c6ae136ed6ae6a alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640
+RMD160 fd9fbd736d6de586e664ee64b47396428759bb6f alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640
+SHA256 8ecf14c98968dfcda32266dd77fa91b385e8129d13093d966dde55358f49dd10 alsa-driver-1.0.14rc2_p3234.tar.bz2 16525640