Version bump, bug 207427

Package-Manager: portage-2.1.4.4

3 files changed, 191 insertions, 3 deletions

diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index cf82502baaa9..b83bc8eb9a89 100644
--- a/media-sound/alsa-driver/ChangeLog
+++ b/media-sound/alsa-driver/ChangeLog
@@ -1,6 +1,11 @@
 # 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.287 2007/10/24 19:39:41 phreak Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.288 2008/04/14 02:47:04 beandog Exp $
+
+*alsa-driver-1.0.16 (14 Apr 2008)
+
+  14 Apr 2008; Steve Dibb <beandog@gentoo.org> +alsa-driver-1.0.16.ebuild:
+  Version bump, bug 207427
 
   24 Oct 2007; Christian Heim <phreak@gentoo.org>
   -alsa-driver-1.0.13.ebuild, -alsa-driver-1.0.14_rc1.ebuild:
diff --git a/media-sound/alsa-driver/Manifest b/media-sound/alsa-driver/Manifest
index 981ba6d8dc2e..a6b31c80dd1c 100644
--- a/media-sound/alsa-driver/Manifest
+++ b/media-sound/alsa-driver/Manifest
@@ -5,8 +5,10 @@ AUX alsa-driver-1.0.14_rc2-tumbler-ppc.patch 1105 RMD160 ae270a067ba51e4e5803734
 AUX alsa-driver-1.0.15-linux-2.4.patch 278 RMD160 13b53ecf56b11de3d6ae4683578b12b3fdc8c649 SHA1 4bfb7c3bf4980cbe26a33ef271f3ea3813c46d0f SHA256 e7584aedf46dcbfbc6ee5afaa998991e5adaea3057b69b747d2cd403dccac877
 DIST alsa-driver-1.0.14.tar.bz2 2600096 RMD160 2d017ed11bd037e450ffa969602f84cc104e5b72 SHA1 9bb16c918e7e57a419c563425d1d8f76b535970a SHA256 4987c05fd5516f9cb36ff4b73ccb77300124423b2bd6c66260eed73317529eca
 DIST alsa-driver-1.0.15.tar.bz2 2677415 RMD160 f3cc3a1ad06b5a894fc6732f5261f5fc06c63421 SHA1 f68bb889538ba04b6d2ce7722d491f98dd00c144 SHA256 dd34ac303ac49b655f3a1a342fd4bafd90722ffd41ceb9af59821d5c13caa01d
+DIST alsa-driver-1.0.16.tar.bz2 2725590 RMD160 936d57bd8c255539a6759756d52221963b4dbc5f SHA1 03cc55e6d23d8368d896e1582ce4588425ce00f9 SHA256 ec2a18fdd08e7678eae57e44f944061ebb256a3c5ce81674c74423a0555cf91d
 EBUILD alsa-driver-1.0.14-r1.ebuild 7072 RMD160 80b45a53d0a9cd197bc88892229028e713d7b109 SHA1 7f71c0657c6574af736fd1f208047515b3572654 SHA256 3c3a9ef156f9c5a91c2edba14a253dfb1d55e5e4817cc1fa9a0a2cc4e6849f89
 EBUILD alsa-driver-1.0.15.ebuild 7055 RMD160 03d69abe625af9da885dbec390cb17c77547b186 SHA1 3fd3629bc67d03177dbccea9f26d01bc60a537cc SHA256 1041d340617773855d7909a23a786040601a4d492e71ead3790c79ae7f51d14b
+EBUILD alsa-driver-1.0.16.ebuild 7042 RMD160 38a81c5ba89afd496de264e0ac5bcbca39bcf2de SHA1 87f7c44777009781a7da65bfb71fbfee7e730c8c SHA256 319b748dee347377f5f71efa1cad17fc609c963471763e089886e21362ec35ea
 EBUILD alsa-driver-9999.ebuild 6607 RMD160 c9ba6d45ef438a5c0e3c7033001f807006d355c9 SHA1 552bd47dee56891409036e2b1812c972980906d8 SHA256 21f7540dd1a8c7ba197fc739ef9e252c572449f76bf7ba2eefd9e2460465dd22
-MISC ChangeLog 49660 RMD160 61140b5e3b985d637783ce86946eba7cbeb3bcf1 SHA1 bc07c166400e66901344388a12cacd8187514b9b SHA256 0e7c5d811bff444b0b7c3d175c3153c0fba598ac320ef451943564b83735db53
+MISC ChangeLog 49799 RMD160 7b9c5ce6b16fb96c688e90aa9413dc1e8538f470 SHA1 8f2457ef98333f908ffbb7673e4d91403660b3db SHA256 f83da6dac782c72708f90cc2735ab54f79288ec43de36ee135cae6f07c55eb60
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.16.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.16.ebuild
new file mode 100644
index 000000000000..6b7b46dd3eb8
--- /dev/null
+++ b/media-sound/alsa-driver/alsa-driver-1.0.16.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2008 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.16.ebuild,v 1.1 2008/04/14 02:47:04 beandog Exp $
+
+inherit autotools linux-mod flag-o-matic eutils multilib linux-info
+
+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 ~mips ~ppc ~ppc64 ~x86"
+IUSE="oss debug midi"
+
+IUSE_CARDS="seq-dummy dummy virmidi mtpav mts64 serial-u16550 mpu401
+loopback portman2x4 pcsp 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 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 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
+	 !media-sound/snd-aoa"
+DEPEND="${RDEPEND}
+	>=media-sound/alsa-headers-1.0.16
+	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."
+
+	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}"
+
+	#kernel_is 2 4 && epatch "${FILESDIR}"/alsa-driver-1.0.15-linux-2.4.patch
+
+	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 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
+}