summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-07-19 19:14:33 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-07-19 19:14:33 +0000
commit328e654ae2a26f81cf417a91e172f2fa12695ce5 (patch)
treeaeee56421485c82ee27ae9f7dc9aadda77bbff23 /media-sound/alsa-driver
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-328e654ae2a26f81cf417a91e172f2fa12695ce5.tar.gz
gentoo-2-328e654ae2a26f81cf417a91e172f2fa12695ce5.tar.bz2
gentoo-2-328e654ae2a26f81cf417a91e172f2fa12695ce5.zip
Added alsa-headers to RDEPEND. Added in cs46xx patch to close bug #56056.
Diffstat (limited to 'media-sound/alsa-driver')
-rw-r--r--media-sound/alsa-driver/ChangeLog6
-rw-r--r--media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild12
2 files changed, 12 insertions, 6 deletions
diff --git a/media-sound/alsa-driver/ChangeLog b/media-sound/alsa-driver/ChangeLog
index fb297d15cd27..9510e37c19fb 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.89 2004/07/01 07:48:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/ChangeLog,v 1.90 2004/07/19 19:14:33 eradicator Exp $
+
+ 19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ alsa-driver-1.0.5a.ebuild:
+ Added alsa-headers to RDEPEND. Added in cs46xx patch to close bug #56056.
01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
alsa-driver-0.5.12a.ebuild, alsa-driver-0.9.0_rc2.ebuild,
diff --git a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
index 9158b13af3b0..b05983524ffc 100644
--- a/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
+++ b/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 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.5a.ebuild,v 1.2 2004/07/08 08:11:34 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-driver/alsa-driver-1.0.5a.ebuild,v 1.3 2004/07/19 19:14:33 eradicator Exp $
inherit kernel-mod flag-o-matic eutils
@@ -19,7 +19,8 @@ LICENSE="GPL-2 LGPL-2.1"
IUSE="oss"
-RDEPEND="virtual/modutils"
+RDEPEND="virtual/modutils
+ ~media-sound/alsa-headers-${PV}"
DEPEND="${RDEPEND}
virtual/linux-sources
@@ -42,9 +43,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${PN}-1.0.5-devfix.patch
- # Uncomment to include the cs46xx patch.
- # Sorry no revision bump because portage 2.0.50 does not allow 1.0.5a-r1 as a version string. 1.0.6 should be out soon...
- #epatch ${FILESDIR}/${P}-cs46xx-passthrough.patch
+ epatch ${FILESDIR}/${P}-cs46xx-passthrough.patch
if kernel-mod_is_2_6_kernel || kernel-mod_is_2_5_kernel; then
FULL_KERNEL_PATH="${ROOT}/usr/src/${KV_DIR}"
@@ -94,6 +93,9 @@ src_install() {
dodir /usr/include/sound
make DESTDIR=${D} install || die
+ # Provided by alsa-headers now
+ rm -rf ${D}/usr/include/sound
+
# We have our own scripts in alsa-utils
test -e ${D}/etc/init.d/alsasound && rm ${D}/etc/init.d/alsasound
test -e ${D}/etc/rc.d/init.d/alsasound && rm ${D}/etc/rc.d/init.d/alsasound