Updated to use alsa-headers solution to missing kernel headers.

7 files changed, 81 insertions, 151 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 3fe972b8b0c2..71889544ca37 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.77 2004/07/19 10:01:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.78 2004/07/19 19:27:45 eradicator Exp $
+
+*alsa-lib-1.0.5-r3 (19 Jul 2004)
+
+  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/fix-asound_h.patch, -files/test-asound_h.c,
+  -alsa-lib-1.0.5-r2.ebuild, +alsa-lib-1.0.5-r3.ebuild:
+  Updated to use alsa-headers solution to missing kernel headers.
 
   19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-lib-1.0.3b-r2.ebuild, alsa-lib-1.0.4.ebuild, alsa-lib-1.0.5-r2.ebuild,
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index b701f6bf7a87..bb99a5d0cef5 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -7,8 +7,8 @@ MD5 ad2e580d2d9b3c03b6d190323ed84c2c alsa-lib-1.0.3b-r2.ebuild 1331
 MD5 99818f373fb66d88bd5783ba408b5eee alsa-lib-1.0.4.ebuild 1716
 MD5 8e24e05da3e2af56d9e6873e6be51d3f alsa-lib-1.0.5.ebuild 1720
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 1bb429b04027111449e8c1702ed80aff ChangeLog 11593
-MD5 b82149d0ea39bb7fd33ac28666c2813a alsa-lib-1.0.5-r2.ebuild 3744
+MD5 bcf5536fe389180dd0bd8a4069d0dee1 ChangeLog 11860
+MD5 83e4bf191be2c4c9bc1d40a1e7028b65 alsa-lib-1.0.5-r3.ebuild 1682
 MD5 7866cccb2308203280e2a4382cbddee4 files/alsa-lib-1.0.3b-rate-capture.patch 565
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
@@ -19,6 +19,4 @@ MD5 ebf9199686eb993db91c807d7fd90dcb files/digest-alsa-lib-1.0.2 67
 MD5 11b938c643aab1b11054f43fdc15f703 files/digest-alsa-lib-1.0.3b-r2 68
 MD5 fb12c702eb134e6b86366ccf8aa6153d files/digest-alsa-lib-1.0.4 67
 MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5 67
-MD5 ccd0d6e3f3b86a9f9c020d4d988e86ce files/fix-asound_h.patch 309
-MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r2 67
-MD5 48e9478afe2656cd4869ebaa951f2348 files/test-asound_h.c 54
+MD5 446ddecdcb2f56eec8683f1294749061 files/digest-alsa-lib-1.0.5-r3 67
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild
deleted file mode 100644
index 3eec1cf52c12..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.5-r2.ebuild,v 1.5 2004/07/19 10:01:41 eradicator Exp $
-
-inherit libtool
-
-DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="http://www.alsa-project.org/"
-
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE="static jack"
-
-RDEPEND="virtual/alsa"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.7.2"
-
-PDEPEND="!ppc? ( jack? ( =media-plugins/alsa-jack-${PV}* ) )"
-
-MY_P=${P/_rc/rc}
-#SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
-SRC_URI="mirror://alsaproject/lib/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-#pkg_setup() {
-pkg_postinst() {
-	# This is kinda hackish, so if someone else has a better idea,
-	# feel free to implement it.  We need to detect if /usr/include/sound
-	# exists.  If it does, then we leave it alone.  If it doesn't, we
-	# assume virtual/alsa was satisfied by 2.6 sources and setup a symlink.
-	# If they emerge alsa-driver, then the real dir with overwrite the symlink.
-
-	if ! [ -e /usr/include/sound ]; then
-		if [ -d /usr/src/linux/include/sound ]; then
-			ln -s /usr/src/linux/include/sound /usr/include/sound
-		else
-			eerror "You don't seem to have valid alsa (driver) headers installed at /usr/include/sound."
-			eerror "and I couldn't find any at /usr/src/linux/include/sound to use either.  Please"
-			eerror "emerge alsa-driver or setup /usr/src/linux to point to a valid 2.6.x kernel"
-			eerror "then run ln -s /usr/src/linux/include/sound /usr/include/sound"
-		fi
-	fi
-
-	einfon "Checking sound headers for broken asound.h ... "
-	if ! gcc -c ${FILESDIR}/test-asound_h.c -o ${T}/test1.o &> /dev/null; then
-		echo "yes"
-		eerror "Your version of:"
-		eerror "  /usr/include/sound/asound.h"
-		eerror "is broken (from a user space perspective).  Programs which"
-		eerror "rely on the alsa driver headers will fail to compile. Please"
-		eerror "apply the following patch:"
-		echo
-		eerror "*******************************************************"
-		cat ${FILESDIR}/fix-asound_h.patch
-		eerror "*******************************************************"
-		echo
-		eerror "You should be able to do this by issuing the following commands:"
-		eerror "cd /usr/include/sound"
-		eerror "patch -p0 < ${FILESDIR}/fix-asound_h.patch"
-		echo
-		eerror "If that doesn't work, please apply the patch by hand by"
-		eerror "editing /usr/include/sound/asound.h in a text editor."
-		echo
-#		die "Broken sound/asound.h header included in kernel sources!"
-
-		eerror "Continuting in 10 seconds to let you read this note: "
-		for d in 10 9 8 7 6 5 4 3 2 1; do
-			echo -n "$d "
-			sleep 1
-		done
-		echo
-	else
-		echo "no"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	if use static; then
-		mv ${S} ${S}.static
-		unpack ${A}
-
-		cd ${S}.static
-		elibtoolize
-	fi
-
-	cd ${S}
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=""
-
-	econf --enable-static=no --enable-shared=yes || die
-	emake || die
-
-	# Can't do both according to alsa docs and bug #48233
-	if use static; then
-		cd ${S}.static
-		econf --enable-static=yes --enable-shared=no || die
-		emake || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	#This alsa version does not provide libasound.so.1
-	#Without this library just about everything even remotely
-	#linked to previous versions of alsa-lib will break.
-	#Fortunately, libasound.so.2 seems to be backwards
-	#compatible with libasound.so.1 and a simple link
-	#fixes the problem (fingers crossed)
-	dosym /usr/lib/libasound.so.2 /usr/lib/libasound.so.1
-	dodoc ChangeLog COPYING TODO
-
-	if use static; then
-		cd ${S}.static
-		make DESTDIR="${D}" install || die "make install failed"
-	fi
-}
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.5-r3.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.5-r3.ebuild
new file mode 100644
index 000000000000..7611ad3ee494
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.5-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.5-r3.ebuild,v 1.1 2004/07/19 19:27:45 eradicator Exp $
+
+IUSE="static jack"
+
+inherit libtool
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc ~ia64 ~ppc64"
+LICENSE="GPL-2 LGPL-2.1"
+
+RDEPEND="virtual/alsa
+	 >=media-sound/alsa-headers-1.0.5a"
+
+DEPEND=">=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1"
+
+PDEPEND="!ppc? ( jack? ( =media-plugins/alsa-jack-${PV}* ) )"
+
+src_unpack() {
+	unpack ${A}
+
+	if use static; then
+		mv ${S} ${S}.static
+		unpack ${A}
+
+		cd ${S}.static
+		elibtoolize
+	fi
+
+	cd ${S}
+	elibtoolize
+}
+
+src_compile() {
+	local myconf=""
+
+	econf --enable-static=no --enable-shared=yes || die
+	emake || die
+
+	# Can't do both according to alsa docs and bug #48233
+	if use static; then
+		cd ${S}.static
+		econf --enable-static=yes --enable-shared=no || die
+		emake || die
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	#This alsa version does not provide libasound.so.1
+	#Without this library just about everything even remotely
+	#linked to previous versions of alsa-lib will break.
+	#Fortunately, libasound.so.2 seems to be backwards
+	#compatible with libasound.so.1 and a simple link
+	#fixes the problem (fingers crossed)
+	dosym /usr/lib/libasound.so.2 /usr/lib/libasound.so.1
+	dodoc ChangeLog COPYING TODO
+
+	if use static; then
+		cd ${S}.static
+		make DESTDIR="${D}" install || die "make install failed"
+	fi
+}
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r2 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r3
index 358b269dffe0..358b269dffe0 100644
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r2
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.5-r3
diff --git a/media-libs/alsa-lib/files/fix-asound_h.patch b/media-libs/alsa-lib/files/fix-asound_h.patch
deleted file mode 100644
index bea1a9b42531..000000000000
--- a/media-libs/alsa-lib/files/fix-asound_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- asound.h.vanilla	2004-07-02 17:54:08.477728617 -0700
-+++ asound.h	2004-07-02 17:54:48.148176909 -0700
-@@ -26,6 +26,10 @@
- #if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
- 
- #include <linux/ioctl.h>
-+#include <linux/compiler.h>
-+#ifndef __user
-+#define __user
-+#endif
- 
- #ifdef __KERNEL__
- 
diff --git a/media-libs/alsa-lib/files/test-asound_h.c b/media-libs/alsa-lib/files/test-asound_h.c
deleted file mode 100644
index 903952090dea..000000000000
--- a/media-libs/alsa-lib/files/test-asound_h.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <sound/asound.h>
-
-int main()
-{
-	return 0;
-}
-