13 files changed, 101 insertions, 85 deletions
diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index 83ced549c383..314224eea065 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.45 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.46 2004/01/09 17:59:47 solar Exp $
+
+*alsa-lib-1.0.0_rc2-r1 (09 Jan 2004)
+
+  09 Jan 2004; <solar@gentoo.org> alsa-lib-0.5.10b.ebuild,
+  alsa-lib-0.9.0_rc2.ebuild, alsa-lib-0.9.2.ebuild, alsa-lib-0.9.6.ebuild,
+  alsa-lib-0.9.7.ebuild, alsa-lib-0.9.8.ebuild, alsa-lib-1.0.0_rc1.ebuild,
+  alsa-lib-1.0.0_rc2-r1.ebuild, alsa-lib-1.0.0_rc2.ebuild,
+  files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch:
+  remove trampoline and text relocations
 
   26 Dec 2003; Jason Wever <weeve@gentoo.org> alsa-lib-0.5.10b.ebuild,
   alsa-lib-0.9.0_rc2.ebuild, alsa-lib-0.9.2.ebuild, alsa-lib-0.9.6.ebuild,
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index d8ebf614d0e3..d51efcf7a90e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,19 +1,18 @@
 MD5 7f7f47e99929401e49278587345837ba ChangeLog 6525
-MD5 44636ff421b84fe9312f85ec76a16a48 alsa-lib-0.5.10b.ebuild 698
-MD5 9a30dd42687ac32830c0cff7674ab0fe alsa-lib-0.9.0_rc2.ebuild 1146
-MD5 0f22d170f76b2767cb254bfb6e77c8e2 alsa-lib-0.9.2.ebuild 1119
-MD5 f6898856d385b3060837928ab224c9ee alsa-lib-0.9.6.ebuild 1104
-MD5 27f067fea91cdedf85224cee04e108e5 alsa-lib-0.9.7.ebuild 1104
-MD5 f4e0f1ef6d02ab4b78de83c0c3865052 alsa-lib-0.9.8.ebuild 1570
-MD5 5068720fe2702e0ab1eac5a8a942055d alsa-lib-1.0.0_rc1.ebuild 1519
-MD5 f2b5542574cb4914d4285c1aecaac510 alsa-lib-1.0.0_rc2.ebuild 1519
+MD5 6a5116856e0115c61a8eedceb876cc8c alsa-lib-0.5.10b.ebuild 698
+MD5 3aa2cf4fbe2c918c4bcb94f05963c003 alsa-lib-0.9.0_rc2.ebuild 1146
+MD5 dd407718747caa9687ec02047a301b4a alsa-lib-0.9.8.ebuild 1580
+MD5 7773838769eb8bd1c38f65f345dd3221 alsa-lib-1.0.0_rc2-r1.ebuild 1803
+MD5 98d466a1b485a673ccec01be7ed6460e alsa-lib-0.9.2.ebuild 1119
+MD5 e5b8eee227682170354abbffb757ad0b alsa-lib-0.9.6.ebuild 1104
+MD5 ae86ea974c128f2f17032926dfb34869 alsa-lib-0.9.7.ebuild 1104
 MD5 e1147a642867b3b3ea43518a1376f6d2 metadata.xml 250
 MD5 190a6c4ffe2eef20e3095ab70ea34941 files/configure.diff 586
 MD5 e015f7b1e3c316cf8c9dbbd0bf77a5a7 files/digest-alsa-lib-0.5.10b 69
 MD5 9070048b85478705fe11a7938a70c419 files/digest-alsa-lib-0.9.0_rc2 70
+MD5 8a3190d9f23acedd006359afb79f60bc files/digest-alsa-lib-0.9.8 67
+MD5 d85563e2d37f36cd69695715c46faee3 files/digest-alsa-lib-1.0.0_rc2-r1 70
 MD5 3a81898f3853065f59af943b3e1f4df2 files/digest-alsa-lib-0.9.2 67
 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 37895964945f7c5f25fff4c54db27639 files/digest-alsa-lib-1.0.0_rc1 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
diff --git a/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild b/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
index f51ccc3e58fe..6c74c2303862 100644
--- a/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.5.10b.ebuild,v 1.13 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.5.10b.ebuild,v 1.14 2004/01/09 17:59:47 solar Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Linux Sound Architecture / Library"
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
index 3f292e946b60..4794690ee727 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.9.0_rc2.ebuild,v 1.13 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.0_rc2.ebuild,v 1.14 2004/01/09 17:59:48 solar Exp $
 
 MY_P=${P/_rc/rc}
 S=${WORKDIR}/${MY_P}
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.2.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.2.ebuild
index 3075ecb7cf1c..e648a6a8512f 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.9.2.ebuild,v 1.6 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.2.ebuild,v 1.7 2004/01/09 17:59:48 solar Exp $
 
 inherit libtool
 
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.6.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.6.ebuild
index 70e5897417d0..66b8f2e26911 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.6.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.9.6.ebuild,v 1.3 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.6.ebuild,v 1.4 2004/01/09 17:59:48 solar Exp $
 
 inherit libtool
 
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.7.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.7.ebuild
index e6754280f00a..92d91612e5b7 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.7.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.9.7.ebuild,v 1.2 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.7.ebuild,v 1.3 2004/01/09 17:59:48 solar Exp $
 
 inherit libtool
 
diff --git a/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild b/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild
index 46d4253e4aa5..05c3dc742988 100644
--- a/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-0.9.8.ebuild,v 1.6 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-0.9.8.ebuild,v 1.7 2004/01/09 17:59:48 solar Exp $
 
 inherit libtool
 
@@ -16,7 +16,7 @@ IUSE="jack"
 DEPEND="virtual/glibc
 	>=sys-devel/automake-1.7.2
 	>=sys-devel/autoconf-2.57-r1
-	jack? ( virtual/jack )"
+	!ppc? ( jack? ( virtual/jack ) )"
 
 SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 RESTRICT="nomirror"
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.0_rc1.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.0_rc2-r1.ebuild
index 944542fb04cc..cf9139cbf6a3 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.0_rc1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.0_rc2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.0_rc1.ebuild,v 1.2 2003/12/26 12:20:26 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.0_rc2-r1.ebuild,v 1.1 2004/01/09 17:59:48 solar Exp $
 
 inherit libtool
 
@@ -16,7 +16,7 @@ IUSE="jack"
 DEPEND="virtual/glibc
 	>=sys-devel/automake-1.7.2
 	>=sys-devel/autoconf-2.57-r1
-	jack? ( virtual/jack )"
+	!ppc? ( jack? ( virtual/jack ) )"
 
 MY_P=${P/_rc/rc}
 SRC_URI="ftp://ftp.alsa-project.org/pub/lib/${MY_P}.tar.bz2"
@@ -24,6 +24,16 @@ SRC_URI="ftp://ftp.alsa-project.org/pub/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"
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.0_rc2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.0_rc2.ebuild
deleted file mode 100644
index 64333fffcb45..000000000000
--- a/media-libs/alsa-lib/alsa-lib-1.0.0_rc2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2003 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.0_rc2.ebuild,v 1.2 2003/12/26 12:20:26 weeve 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
-	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_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.0_rc2-notextrel-notrampoline.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch
new file mode 100644
index 000000000000..7629e603c924
--- /dev/null
+++ b/media-libs/alsa-lib/files/alsa-lib-1.0.0_rc2-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_rc1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc1
deleted file mode 100644
index d4e968e350ea..000000000000
--- a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f602528dbc7dd45c9079aea154a9325f alsa-lib-1.0.0rc1.tar.bz2 557872
diff --git a/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2-r1 b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2-r1
new file mode 100644
index 000000000000..e6b3d5950079
--- /dev/null
+++ b/media-libs/alsa-lib/files/digest-alsa-lib-1.0.0_rc2-r1
@@ -0,0 +1 @@
+MD5 eccc78e1157334a024d0a8e521a88593 alsa-lib-1.0.0rc2.tar.bz2 557821