Removing unneeded patches.

3 files changed, 4 insertions, 110 deletions

diff --git a/media-libs/alsa-lib/ChangeLog b/media-libs/alsa-lib/ChangeLog
index c3261a681e46..d2e7ebfc5694 100644
--- a/media-libs/alsa-lib/ChangeLog
+++ b/media-libs/alsa-lib/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for media-libs/alsa-lib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.59 2004/03/27 07:48:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/ChangeLog,v 1.60 2004/03/27 07:49:34 eradicator Exp $
 
   26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
   alsa-lib-0.9.6.ebuild, alsa-lib-0.9.7.ebuild, alsa-lib-0.9.8.ebuild,
-  alsa-lib-1.0.0_rc2-r1.ebuild, alsa-lib-1.0.1.ebuild:
+  alsa-lib-1.0.0_rc2-r1.ebuild, alsa-lib-1.0.1.ebuild,
+  files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch,
+  files/alsa-lib-1.0.1-notextrel-notrampoline.patch:
   Removing old ebuilds.  Removed explicit S= from alsa-lib-0.9.8
 
 *alsa-lib-1.0.3b-r2 (24 Mar 2004)
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
deleted file mode 100644
index 7629e603c924..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.0_rc2-notextrel-notrampoline.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/alsa-lib-1.0.1-notextrel-notrampoline.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.1-notextrel-notrampoline.patch
deleted file mode 100644
index 7629e603c924..000000000000
--- a/media-libs/alsa-lib/files/alsa-lib-1.0.1-notextrel-notrampoline.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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;
-