Version bumped.

5 files changed, 124 insertions, 4 deletions

diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 8c200336c949..c6bdebbcd962 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,11 +1,11 @@
-MD5 bd21bc7bcd5f98e1848d84ef82871b26 ChangeLog 6930
+MD5 c72cfd033b108d3d6f464bdcec7b6639 ChangeLog 7108
 MD5 88e7d7a1bdef247fc6b175e8ee840dd8 alsa-lib-0.5.10b.ebuild 698
 MD5 477c697a35479bcb208db06f896e46cb alsa-lib-0.9.0_rc2.ebuild 1146
 MD5 625080376529cda42906a9c004d154bd alsa-lib-0.9.2.ebuild 1119
 MD5 e024e9ec933cfceabcc144e8f7272d6f alsa-lib-0.9.6.ebuild 1104
 MD5 aa121973afeb12465c8ca0e5771985f6 alsa-lib-0.9.7.ebuild 1104
 MD5 ce92e2a792b7517424008d9b33f2baab alsa-lib-0.9.8.ebuild 1580
-MD5 81de5d6acaaabfba855da4ff2bedacd0 alsa-lib-1.0.1.ebuild 1806
+MD5 b48d120f602c4654d0a63ced4419920c alsa-lib-1.0.1.ebuild 1800
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 81de5d6acaaabfba855da4ff2bedacd0 alsa-lib-1.0.0_rc2-r1.ebuild 1806
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
@@ -16,6 +16,6 @@ MD5 541c733628b71b1ec777ef9d269b9cbd files/digest-alsa-lib-0.9.6 67
 MD5 04bdf525aa1c87419889572249192ff3 files/digest-alsa-lib-0.9.7 67
 MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
 MD5 d85563e2d37f36cd69695715c46faee3 files/digest-alsa-lib-1.0.0_rc2-r1 70
-MD5 d85563e2d37f36cd69695715c46faee3 files/digest-alsa-lib-1.0.0_rc2 70
 MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch 1788
 MD5 62c198849d6ef20d1add476b1d3eeb2a files/digest-alsa-lib-1.0.1 67
+MD5 b1d7f756d25d6a0b7270610b8730259d files/alsa-lib-1.0.1-notextrel-notrampoline.patch 1788
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild
new file mode 100644
index 000000000000..614ac324036d
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.1.ebuild,v 1.1 2004/01/10 13:29:56 mholzer Exp $
+
+inherit libtool
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64 -sparc"
+LICENSE="GPL-2 LGPL-2.1"
+
+IUSE="jack"
+
+DEPEND="virtual/glibc
+	>=sys-devel/automake-1.7.2
+	>=sys-devel/autoconf-2.57-r1
+	!ppc? ( jack? ( virtual/jack ) )"
+
+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"
+RESTRICT="nomirror"
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# - remove trampolines and text relocations - <solar@gentoo>
+	## send this patch upstream after we have tested fully 
+	## on the various arches for inclusion in 1.x final
+	epatch ${FILESDIR}/${PN}-${PV}-notextrel-notrampoline.patch
+}
+
+src_compile() {
+	elibtoolize
+	econf || die "./configure failed"
+	emake || die "make failed"
+
+	if [ -n "`use jack`" ]
+	then
+		cd ${S}/src/pcm/ext
+		make jack || die "make on jack plugin failed"
+	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.2 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 [ -n "`use jack`" ]
+	then
+		cd ${S}/src/pcm/ext
+		make DESTDIR=${D} install-jack || die "make install on jack plugin failed"
+	fi
+}
diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.1-notextrel-notrampoline.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.1-notextrel-notrampoline.patch
new file mode 100644
index 000000000000..7629e603c924
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.1-notextrel-notrampoline.patch
@@ -0,0 +1,54 @@
+diff -Nru alsa-lib-1.0.0rc2-original/src/control/hcontrol.c alsa-lib-1.0.0rc2/src/control/hcontrol.c
+--- alsa-lib-1.0.0rc2-original/src/control/hcontrol.c	Mon Oct 13 08:06:46 2003
++++ alsa-lib-1.0.0rc2/src/control/hcontrol.c	Sat Dec 20 13:48:32 2003
+@@ -48,6 +48,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <pthread.h>
+ #ifndef DOC_HIDDEN
+ #define __USE_GNU
+ #endif
+@@ -409,17 +410,26 @@
+ 	return 0;
+ }
+ 
++static snd_hctl_t *compare_hctl;
++static int hctl_compare(const void *a, const void *b) {
++	return compare_hctl->compare(*(const snd_hctl_elem_t * const *) a,
++			     *(const snd_hctl_elem_t * const *) b);
++}
++
+ static void snd_hctl_sort(snd_hctl_t *hctl)
+ {
+ 	unsigned int k;
+-	int compar(const void *a, const void *b) {
+-		return hctl->compare(*(const snd_hctl_elem_t * const *) a,
+-				     *(const snd_hctl_elem_t * const *) b);
+-	}
++	static pthread_mutex_t sync_lock = PTHREAD_MUTEX_INITIALIZER;
++
+ 	assert(hctl);
+ 	assert(hctl->compare);
+ 	INIT_LIST_HEAD(&hctl->elems);
+-	qsort(hctl->pelems, hctl->count, sizeof(*hctl->pelems), compar);
++
++	pthread_mutex_lock(&sync_lock);
++	compare_hctl = hctl;
++	qsort(hctl->pelems, hctl->count, sizeof(*hctl->pelems), hctl_compare);
++	pthread_mutex_unlock(&sync_lock);
++
+ 	for (k = 0; k < hctl->count; k++)
+ 		list_add_tail(&hctl->pelems[k]->list, &hctl->elems);
+ }
+diff -Nru alsa-lib-1.0.0rc2-original/src/pcm/pcm_direct.c alsa-lib-1.0.0rc2/src/pcm/pcm_direct.c
+--- alsa-lib-1.0.0rc2-original/src/pcm/pcm_direct.c	Fri Oct 17 09:53:06 2003
++++ alsa-lib-1.0.0rc2/src/pcm/pcm_direct.c	Sat Dec 20 13:49:22 2003
+@@ -98,7 +98,6 @@
+ 
+ int snd_pcm_direct_shm_create_or_connect(snd_pcm_direct_t *dmix)
+ {
+-	static int snd_pcm_direct_shm_discard(snd_pcm_direct_t *dmix);
+ 	struct shmid_ds buf;
+ 	int ret = 0;
+ 	
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2
deleted file mode 100644
index e6b3d5950079..000000000000
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eccc78e1157334a024d0a8e521a88593 alsa-lib-1.0.0rc2.tar.bz2 557821
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.1
new file mode 100644
index 000000000000..0f7779f251a3
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.1
@@ -0,0 +1 @@
+MD5 089cf4b96a00971d9fb5e395afe86b4e alsa-lib-1.0.1.tar.bz2 563452