summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-27 16:57:01 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-27 16:57:01 +0000
commit569c0da904b97bed6b7ad57322b80f1db153e96e (patch)
tree619ade13df639a904ccea4229788c13a9956f237 /media-sound/pulseaudio
parentFix HOMEPAGE, closes bug 360535 by Dean Matzkov (diff)
downloadgentoo-2-569c0da904b97bed6b7ad57322b80f1db153e96e.tar.gz
gentoo-2-569c0da904b97bed6b7ad57322b80f1db153e96e.tar.bz2
gentoo-2-569c0da904b97bed6b7ad57322b80f1db153e96e.zip
old
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/pulseaudio')
-rw-r--r--media-sound/pulseaudio/Manifest14
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.15-CVE-2009-1894.patch49
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.15-bsd.patch18
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch59
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-bt-nohal.patch28
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-create-directory.patch21
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch49
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch18
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch13
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.9-CVE-2009-1894.patch64
-rw-r--r--media-sound/pulseaudio/files/pulseaudio.init.d-223
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.15-r2.ebuild160
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.19.ebuild184
13 files changed, 0 insertions, 700 deletions
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 32d3d035c6c4..ef4b7c7fe187 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,22 +1,8 @@
-AUX pulseaudio-0.9.15-CVE-2009-1894.patch 1969 RMD160 69a11b7f132d24e7f99fec180ffed3caf806de77 SHA1 1b9106e52c063e83b8577434360edaf3be81351d SHA256 a14e01e386f60c083dda6049e951bcf17af693ac475afd1f455d71f400f2e526
-AUX pulseaudio-0.9.15-bsd.patch 549 RMD160 d44e309557353c115281e860bfa643b197d04921 SHA1 0cd07acc70c0e53984e7a639d9668b4817cb804c SHA256 d044e27ad71424b601f0de37e29321226579146203c6c557434d11e298798787
-AUX pulseaudio-0.9.19-fweb.patch 2263 RMD160 ab33d2b583244edde0a64c6cb285c9b0e2bf40fd SHA1 5ef59ce5e84b1b214b7e54ea64d9de851c70b25b SHA256 80fdc6c68566ed7c6bf02c263d0056c2c9f0c911d308ec166a35e309b47b2e2b
AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
-AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 SHA1 9f50549357b5fa498e0b7f67258de431e90f89e2 SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d
-AUX pulseaudio-0.9.8-create-directory.patch 685 RMD160 87c287d3ff6047c9bee892271ea3b3ac6d06fa1a SHA1 2083a575f6272135909efce292d43a2f947f285f SHA256 5fd77f5d0a897d3f70cb3e20e24b97e7f0f46d9266b8758c56a7cb84f763e571
-AUX pulseaudio-0.9.8-esoundpath.patch 1798 RMD160 c009c0d1cfdf0bb9db6ef476df29bca56b68ab58 SHA1 5901b164c5b4bd3fa485dbc1a5a950f2ba5794a9 SHA256 4ae132c68a19f07ecf1fef9c55cebc7615e38b157dc196961f666c3914a4641b
-AUX pulseaudio-0.9.8-polkit.patch 766 RMD160 20bafbeae68fb9092dd3ef2d6d7facca86091d42 SHA1 490aeea34db54e779b84e9922bdb372e1cdcde7e SHA256 112d4da6597783e4dd3d69b73fe08c91631e280b23e84a41c2f1f8b3d9c8d368
-AUX pulseaudio-0.9.8-svn2074.patch 412 RMD160 49e416e5e9747cd7c2065b98220e99910375f826 SHA1 9a6d61fd8a000baa4699904154453b83c7bae6f9 SHA256 70b0baed200e5c86672f395520131af797eab7e8ea7fbad2b9caf00ad3e22b65
-AUX pulseaudio-0.9.9-CVE-2009-1894.patch 2274 RMD160 727d4e4e355612f105d5c8bbe66e898d5ceee1f6 SHA1 679aace5e7647d636cf3f186993fa0d7a7cc8855 SHA256 e4981106768e4a60ca7384200668a5071cbe934afecad850e58b626a7414cc43
AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
-AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1 e0a46567d43f7e3620c8da90654a0f16235a36fa SHA256 24c7f5319161105e46382c7c1340ae634d54cfbe32cdf70c86d6fd6c40782ee0
AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
-DIST pulseaudio-0.9.15.tar.gz 1704374 RMD160 7cab0d9ab44180b6440ae7f151a6cbb91928b321 SHA1 56fb71e4e88c901d9941d85bfe142612c30e5c8e SHA256 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1
-DIST pulseaudio-0.9.19.tar.gz 2029090 RMD160 2de3f4b9ec587c3df3b7a9d11a6d1b9d5f9c8690 SHA1 176d54b09051c560427ed251c838197ba2414bb0 SHA256 e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
DIST pulseaudio-0.9.21.1.tar.gz 1930604 RMD160 f66e8e7bf8a0c9ee698864eda58a096fa40b91cf SHA1 8208face40802b93174ca503f314a772b5fceaeb SHA256 1a7972da037140375b2d5cc95f0c82bfa0c86b05ab74a569081a5b99d32533ef
DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
-EBUILD pulseaudio-0.9.15-r2.ebuild 4695 RMD160 1778eb536613625bbb9b9696308cdffbfc0fc597 SHA1 fdbb8b1d7bee3b93d87c2f9740d7c62ccb269258 SHA256 dc84c1fc7aea839dcc84adc48f3444fa4bab1f5dde7bd423da3c4dd370d6c5fd
-EBUILD pulseaudio-0.9.19.ebuild 5334 RMD160 29b552d022c00141e981372ca42fdb034825a2e9 SHA1 30b1e36246bab569f24d6534d348b8927d0500de SHA256 65170dfddee2c419375903139db4336884774d89a06145aba5421c904e930c55
EBUILD pulseaudio-0.9.21.1.ebuild 7240 RMD160 430702401e4177a58dbd7336e940d3c756270873 SHA1 80a2dcb509f28ea4bf2c066a05e0742b813c7e5f SHA256 d79966441bd715fe4a34d5d41ef2a1b7406cc87b9a726a65486c37beeaa9fc3a
EBUILD pulseaudio-0.9.22.ebuild 6650 RMD160 17e36be6764176b3c9d5758bb68b44cba41c09a9 SHA1 9e934da0b1f333045a4ea2c06e1811b5ddfd9a54 SHA256 73af55c436436a5c68cb9d3671c63d8bfe707372a08884f6ad7c1a804a7f3b60
EBUILD pulseaudio-9999.ebuild 6503 RMD160 56f8b4614247efe3144a3b13511b4a48c0d35b15 SHA1 0f38b40ca8564918fbf3a3f0a4f9bbb859889758 SHA256 e275753ac462f55c19bfa020056c2dc92ee7e78e8bdb3c9e438a18e0f621116f
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.15-CVE-2009-1894.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.15-CVE-2009-1894.patch
deleted file mode 100644
index 729ed9178286..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.15-CVE-2009-1894.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: pulseaudio-0.9.15/src/daemon/main.c
-===================================================================
---- pulseaudio-0.9.15.orig/src/daemon/main.c
-+++ pulseaudio-0.9.15/src/daemon/main.c
-@@ -399,28 +399,6 @@ int main(int argc, char *argv[]) {
- pa_log_set_level(PA_LOG_NOTICE);
- pa_log_set_flags(PA_LOG_COLORS|PA_LOG_PRINT_FILE|PA_LOG_PRINT_LEVEL, PA_LOG_RESET);
-
--#if defined(__linux__) && defined(__OPTIMIZE__)
-- /*
-- Disable lazy relocations to make usage of external libraries
-- more deterministic for our RT threads. We abuse __OPTIMIZE__ as
-- a check whether we are a debug build or not.
-- */
--
-- if (!getenv("LD_BIND_NOW")) {
-- char *rp;
--
-- /* We have to execute ourselves, because the libc caches the
-- * value of $LD_BIND_NOW on initialization. */
--
-- pa_set_env("LD_BIND_NOW", "1");
--
-- if ((rp = pa_readlink("/proc/self/exe")))
-- pa_assert_se(execv(rp, argv) == 0);
-- else
-- pa_log_warn("Couldn't read /proc/self/exe, cannot self execute. Running in a chroot()?");
-- }
--#endif
--
- #ifdef HAVE_GETUID
- real_root = getuid() == 0;
- suid_root = !real_root && geteuid() == 0;
-Index: pulseaudio-0.9.15/src/Makefile.am
-===================================================================
---- pulseaudio-0.9.15.orig/src/Makefile.am
-+++ pulseaudio-0.9.15/src/Makefile.am
-@@ -153,9 +153,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
- endif
-
- if FORCE_PREOPEN
--pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
-+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -Wl,-z,now -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
- else
--pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
-+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -Wl,-z,now -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
- endif
-
- if HAVE_POLKIT
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.15-bsd.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.15-bsd.patch
deleted file mode 100644
index 42e414645ccd..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.15-bsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit ff5b7fb222db265dfbc5f44dc3d55ce6396d78ca
-Author: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
-Date: Fri May 15 23:42:43 2009 +0200
-
- Add missing headers' include to build on FreeBSD 7.1.
-
-diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
-index 629328a..cb037de 100644
---- a/src/modules/rtp/rtsp_client.c
-+++ b/src/modules/rtp/rtsp_client.c
-@@ -30,6 +30,7 @@
- #include <arpa/inet.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#include <netinet/in.h>
-
- #ifdef HAVE_SYS_FILIO_H
- #include <sys/filio.h>
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch
deleted file mode 100644
index 36a89bc59bab..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.19-fweb.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 8ec304d2d1e956cc3f5f35437ac4fe580b36f004 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Wed, 7 Oct 2009 19:31:11 +0200
-Subject: [PATCH] Fix build when using -fweb, accept both register and memory constraints.
-
-This was reported as Gentoo bug #287391 by Torsten Kaiser, and the fix was
-suggested by Mike Frysinger.
----
- src/pulsecore/svolume_mmx.c | 4 ++--
- src/pulsecore/svolume_sse.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/pulsecore/svolume_mmx.c b/src/pulsecore/svolume_mmx.c
-index 1768eb5..745c7de 100644
---- a/src/pulsecore/svolume_mmx.c
-+++ b/src/pulsecore/svolume_mmx.c
-@@ -152,7 +152,7 @@ pa_volume_s16ne_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
- " emms \n\t"
-
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
-- : "X" ((pa_reg_x86)channels)
-+ : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
- }
-@@ -228,7 +228,7 @@ pa_volume_s16re_mmx (int16_t *samples, int32_t *volumes, unsigned channels, unsi
- " emms \n\t"
-
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" ((pa_reg_x86)channel), "=&r" (temp)
-- : "X" ((pa_reg_x86)channels)
-+ : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
- }
-diff --git a/src/pulsecore/svolume_sse.c b/src/pulsecore/svolume_sse.c
-index ab9394f..1cc4e0a 100644
---- a/src/pulsecore/svolume_sse.c
-+++ b/src/pulsecore/svolume_sse.c
-@@ -149,7 +149,7 @@ pa_volume_s16ne_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
- "8: \n\t"
-
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
-- : "X" ((pa_reg_x86)channels)
-+ : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
- }
-@@ -237,7 +237,7 @@ pa_volume_s16re_sse2 (int16_t *samples, int32_t *volumes, unsigned channels, uns
- "8: \n\t"
-
- : "+r" (samples), "+r" (volumes), "+r" (length), "=D" (channel), "=&r" (temp)
-- : "X" ((pa_reg_x86)channels)
-+ : "rm" ((pa_reg_x86)channels)
- : "cc"
- );
- }
---
-1.6.5.rc2
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-bt-nohal.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-bt-nohal.patch
deleted file mode 100644
index 95ffbb5d3335..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.8-bt-nohal.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: pulseaudio-0.9.8/configure.ac
-===================================================================
---- pulseaudio-0.9.8.orig/configure.ac
-+++ pulseaudio-0.9.8/configure.ac
-@@ -836,7 +836,7 @@ if test "x$HAVE_HAL" = x1 ; then
- dbus=yes
- fi
-
--if test "x${dbus}" != xno ; then
-+if test "x${dbus}" != xno || test "x${bluez}" != xno || "x${hal}" != xno ; then
-
- PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.0.0 ],
- [
-Index: pulseaudio-0.9.8/src/Makefile.am
-===================================================================
---- pulseaudio-0.9.8.orig/src/Makefile.am
-+++ pulseaudio-0.9.8/src/Makefile.am
-@@ -1424,8 +1424,8 @@ module_jack_source_la_CFLAGS = $(AM_CFLA
- # HAL
- libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
- libdbus_util_la_LDFLAGS = -avoid-version
--libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
--libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
-+libdbus_util_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la
-+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-
- module_hal_detect_la_SOURCES = modules/module-hal-detect.c
- module_hal_detect_la_LDFLAGS = -module -avoid-version
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-create-directory.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-create-directory.patch
deleted file mode 100644
index 92bb2ebf41dd..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.8-create-directory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: src/pulsecore/core-util.c
-===================================================================
---- src/pulsecore/core-util.c (revision 2077)
-+++ src/pulsecore/core-util.c (revision 2078)
-@@ -1129,8 +1129,15 @@
-
- if ((e = getenv("PULSE_CONFIG_PATH")))
- fn = lfn = pa_sprintf_malloc("%s/%s", e, local);
-- else if (pa_get_home_dir(h, sizeof(h)))
-+ else if (pa_get_home_dir(h, sizeof(h))) {
-+ char *d;
-+
-+ d = pa_sprintf_malloc("%s/.pulse", h);
-+ mkdir(d, 0755);
-+ pa_xfree(d);
-+
- fn = lfn = pa_sprintf_malloc("%s/.pulse/%s", h, local);
-+ }
-
- if (lfn) {
- FILE *f;
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch
deleted file mode 100644
index 317d39a59cb3..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: src/modules/module-protocol-stub.c
-===================================================================
---- src/modules/module-protocol-stub.c (revision 2082)
-+++ src/modules/module-protocol-stub.c (working copy)
-@@ -218,9 +218,13 @@
- char tmp[PATH_MAX];
-
- #if defined(USE_PROTOCOL_ESOUND)
-- char tmp2[PATH_MAX];
-+#if defined(USE_PERUSER_ESOUND_SOCKET)
-+ char esdsocketpath[PATH_MAX];
-+#else
-+ const char esdsocketpath[] = "/tmp/.esd/socket";
- #endif
- #endif
-+#endif
-
- pa_assert(m);
-
-@@ -265,8 +269,10 @@
-
- #if defined(USE_PROTOCOL_ESOUND)
-
-- snprintf(tmp2, sizeof(tmp2), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
-- pa_runtime_path(pa_modargs_get_value(ma, "socket", tmp2), tmp, sizeof(tmp));
-+#if defined(USE_PERUSER_ESOUND_SOCKET)
-+ snprintf(esdsocketpath, sizeof(esdsocketpath), "/tmp/.esd-%lu/socket", (unsigned long) getuid());
-+#endif
-+ pa_runtime_path(pa_modargs_get_value(ma, "socket", esdsocketpath), tmp, sizeof(tmp));
- u->socket_path = pa_xstrdup(tmp);
-
- /* This socket doesn't reside in our own runtime dir but in
-Index: configure.ac
-===================================================================
---- configure.ac (revision 2082)
-+++ configure.ac (working copy)
-@@ -982,6 +982,12 @@
- AC_SUBST(PA_ACCESS_GROUP)
- AC_DEFINE_UNQUOTED(PA_ACCESS_GROUP,"$PA_ACCESS_GROUP", [Access group])
-
-+AC_ARG_WITH(peruser_esound, AS_HELP_STRING([--with-peruser-esound-socket], [Use per-user esound socket directory, like /tmp/.esd-UID/socket.]))
-+
-+if test "x$with_peruser_esound" = "xyes"; then
-+ AC_DEFINE([USE_PERUSER_ESOUND_SOCKET], [1], [Define this if you want per-user esound socket directories])
-+fi
-+
- #### PulseAudio system runtime dir ####
- PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
- AC_SUBST(PA_SYSTEM_RUNTIME_PATH)
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch
deleted file mode 100644
index fcd0183ffdc3..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.8-polkit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: pulseaudio-0.9.8/configure.ac
-===================================================================
---- pulseaudio-0.9.8.orig/configure.ac
-+++ pulseaudio-0.9.8/configure.ac
-@@ -881,11 +881,11 @@ if test "x${polkit}" != xno ; then
- [
- HAVE_POLKIT=1
- saved_LIBS="$LIBS"
-- LIBS="$LIBS POLKIT_LIBS"
-+ LIBS="$LIBS $POLKIT_LIBS"
- AC_CHECK_FUNCS(polkit_context_is_caller_authorized)
- LIBS="$saved_LIBS"
- AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit])
-- policydir=`pkg-config --variable prefix`/usr/share/PolicyKit/policy/
-+ policydir=`pkg-config polkit-dbus --variable prefix`/share/PolicyKit/policy/
- AC_SUBST(policydir)
- ],
- [
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch
deleted file mode 100644
index 707abef780f5..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.8-svn2074.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/pulse/stream.c
-===================================================================
---- src/pulse/stream.c (revision 2073)
-+++ src/pulse/stream.c (revision 2074)
-@@ -586,7 +586,7 @@
- }
- }
-
-- if (s->context->version >= 12) {
-+ if (s->context->version >= 12 && s->direction != PA_STREAM_UPLOAD) {
- pa_sample_spec ss;
- pa_channel_map cm;
- const char *dn = NULL;
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.9-CVE-2009-1894.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.9-CVE-2009-1894.patch
deleted file mode 100644
index affa986d2f8d..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.9-CVE-2009-1894.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From fdd11d6cc0f4c75f75c62fb7d419d157ce00c956 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Tue, 7 Jul 2009 20:51:53 +0200
-Subject: [PATCH] Remove exploitable LD_BIND_NOW hack.
-
-Instead of trying to re-execute pulseaudio itself with LD_BIND_NOW set,
-just find the correct flag for the linker to request immediate bindings
-(all ELF files support that option), and use that when linking the daemon.
-
-Reduce the amount of compiled and executed code as well.
----
- src/Makefile.am | 4 ++--
- src/daemon/main.c | 19 -------------------
- 2 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2ac4f3d..7d1c431 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -147,9 +147,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
- endif
-
- if FORCE_PREOPEN
--pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
-+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -Wl,-z,now -dlpreopen force $(foreach f,$(PREOPEN_LIBS),-dlpreopen $(f))
- else
--pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
-+pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) -Wl,-z,now -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
- endif
-
- if HAVE_POLKIT
-diff --git a/src/daemon/main.c b/src/daemon/main.c
-index 4276d1d..c788917 100644
---- a/src/daemon/main.c
-+++ b/src/daemon/main.c
-@@ -340,25 +340,6 @@ int main(int argc, char *argv[]) {
- #endif
-
-
--#if defined(__linux__) && defined(__OPTIMIZE__)
-- /*
-- Disable lazy relocations to make usage of external libraries
-- more deterministic for our RT threads. We abuse __OPTIMIZE__ as
-- a check whether we are a debug build or not.
-- */
--
-- if (!getenv("LD_BIND_NOW")) {
-- char *rp;
--
-- /* We have to execute ourselves, because the libc caches the
-- * value of $LD_BIND_NOW on initialization. */
--
-- putenv(pa_xstrdup("LD_BIND_NOW=1"));
-- pa_assert_se(rp = pa_readlink("/proc/self/exe"));
-- pa_assert_se(execv(rp, argv) == 0);
-- }
--#endif
--
- #ifdef HAVE_GETUID
- real_root = getuid() == 0;
- suid_root = !real_root && geteuid() == 0;
---
-1.6.3.3
-
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d-2 b/media-sound/pulseaudio/files/pulseaudio.init.d-2
deleted file mode 100644
index 179d1885e017..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio.init.d-2
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/files/pulseaudio.init.d-2,v 1.5 2007/11/07 12:07:10 flameeyes Exp $
-
-depend() {
- need localmount
- use net
- @neededservices@
-}
-
-start() {
- ebegin "Starting pulseaudio"
- PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --system"
- start-stop-daemon --start --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping pulseaudio"
- start-stop-daemon --stop --quiet --exec /usr/bin/pulseaudio --pidfile /var/run/pulse/pid
- eend $?
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.15-r2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.15-r2.ebuild
deleted file mode 100644
index 714bfba3ef28..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.15-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.15-r2.ebuild,v 1.16 2010/09/21 22:36:43 abcd Exp $
-
-EAPI=2
-
-inherit eutils libtool flag-o-matic autotools
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-if [[ ${PV/_rc/} == ${PV} ]]; then
- SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-else
- SRC_URI="http://0pointer.de/public/${P/_rc/-test}.tar.gz"
-fi
-
-S="${WORKDIR}/${P/_rc/-test}"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth +asyncns +glib test"
-
-RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
- caps? ( sys-libs/libcap )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0 )
- avahi? ( >=net-dns/avahi-0.6.12[dbus] )
- >=dev-libs/liboil-0.3.0
- jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
- tcpd? ( sys-apps/tcp-wrappers )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- hal? (
- >=sys-apps/hal-0.5.7
- >=sys-apps/dbus-1.0.0
- )
- app-admin/eselect-esd
- bluetooth? (
- >=net-wireless/bluez-4
- >=sys-apps/dbus-1.0.0
- )
- asyncns? ( net-libs/libasyncns )
- >=media-libs/audiofile-0.2.6-r1
- >=media-libs/speex-1.2_beta
- >=media-libs/libsndfile-1.0.10
- >=dev-libs/liboil-0.3.6
- sys-libs/gdbm
- >=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- dev-libs/libatomic_ops
- dev-util/pkgconfig
- dev-util/intltool"
-
-RDEPEND="${RDEPEND}
- gnome-extra/gnome-audio"
-
-pkg_setup() {
- enewgroup audio 18 # Just make sure it exists
- enewgroup realtime
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-bsd.patch"
- epatch "${FILESDIR}/${P}-CVE-2009-1894.patch"
-
- # The mix and resampler tests are broken in this release, because
- # they weren't updated for the 24-bit sample support; they are
- # fixed in 0.9.16 but I don't think it's worth backporting the
- # fixes. — flameeyes
- sed -i -e '/\(mix\|resampler\)-test/d' src/Makefile.am || die
-
- eautoreconf
- elibtoolize
-}
-
-src_configure() {
- # To properly fix CVE-2008-0008
- append-flags -UNDEBUG
-
- append-ldflags $(no-as-needed)
-
- econf \
- --enable-largefile \
- $(use_enable glib glib2) \
- --disable-solaris \
- $(use_enable asyncns) \
- $(use_enable oss) \
- $(use_enable alsa) \
- $(use_enable lirc) \
- $(use_enable tcpd tcpwrap) \
- $(use_enable jack) \
- $(use_enable lirc) \
- $(use_enable avahi) \
- $(use_enable hal) \
- $(use_enable dbus) \
- $(use_enable gnome gconf) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable bluetooth bluez) \
- --disable-polkit \
- $(use_enable X x11) \
- $(use_enable test default-build-tests) \
- $(use_with caps) \
- --localstatedir=/var \
- --with-realtime-group=realtime \
- --disable-per-user-esound-socket \
- || die "econf failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
-
- dohtml -r doc
- dodoc README
-
- # Create the state directory
- diropts -o pulse -g pulse -m0755
- keepdir /var/run/pulse
-
- find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
- elog "If you want to make use of realtime capabilities of PulseAudio"
- elog "you should follow the realtime guide to create and set up a realtime"
- elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
- elog "Make sure you also have baselayout installed with pam USE flag"
- elog "enabled, if you're using the rlimit method."
- if use bluetooth; then
- elog
- elog "The BlueTooth proximity module is not enabled in the default"
- elog "configuration file. If you do enable it, you'll have to have"
- elog "your BlueTooth controller enabled and inserted at bootup or"
- elog "PulseAudio will refuse to start."
- elog
- elog "Please note that the BlueTooth proximity module seems itself"
- elog "still experimental, so please report to upstream if you have"
- elog "problems with it."
- fi
- if use alsa; then
- local pkg="media-plugins/alsa-plugins"
- if has_version ${pkg} && ! has_version "${pkg}[pulseaudio]"; then
- elog
- elog "You have alsa support enabled so you probably want to install"
- elog "${pkg} with pulseaudio support to have"
- elog "alsa using applications route their sound through pulseaudio"
- fi
- fi
-
- eselect esd update --if-unset
-}
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
deleted file mode 100644
index c62b1e8c6a76..000000000000
--- a/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.19.ebuild,v 1.13 2010/12/22 06:22:26 ford_prefect Exp $
-
-EAPI=2
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-if [[ ${PV/_rc/} == ${PV} ]]; then
- SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-else
- SRC_URI="http://0pointer.de/public/${P/_rc/-test}.tar.gz"
-fi
-
-S="${WORKDIR}/${P/_rc/-test}"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
-IUSE="+alsa avahi +caps jack lirc oss tcpd X hal dbus libsamplerate gnome bluetooth +asyncns +glib test doc +udev ipv6"
-
-RDEPEND="X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libXtst )
- caps? ( sys-libs/libcap )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0 )
- avahi? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
- tcpd? ( sys-apps/tcp-wrappers )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- hal? (
- >=sys-apps/hal-0.5.11
- >=sys-apps/dbus-1.0.0
- )
- app-admin/eselect-esd
- bluetooth? (
- >=net-wireless/bluez-4
- >=sys-apps/dbus-1.0.0
- )
- asyncns? ( net-libs/libasyncns )
- udev? ( >=sys-fs/udev-143[extras] )
- >=media-libs/audiofile-0.2.6-r1
- >=media-libs/speex-1.2_beta
- >=media-libs/libsndfile-1.0.20
- sys-libs/gdbm
- >=sys-devel/libtool-2.2.4" # it's a valid RDEPEND, libltdl.so is used
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- X? (
- x11-proto/xproto
- || ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 )
- )
- dev-libs/libatomic_ops
- dev-util/pkgconfig
- dev-util/intltool"
-
-RDEPEND="${RDEPEND}
- gnome-extra/gnome-audio"
-
-pkg_setup() {
- enewgroup audio 18 # Just make sure it exists
- enewgroup realtime
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
-
- if use udev && use hal; then
- elog "Please note that enabling both udev and hal will build both"
- elog "discover modules, but only udev will be used automatically."
- elog "If you wish to use hal you have to enable it explicitly"
- elog "or you might just disable the hal USE flag entirely."
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fweb.patch
-
- elibtoolize
-}
-
-src_configure() {
- # It's a binutils bug, once I can find time to fix that I'll add a
- # proper dependency and fix this up. — flameeyes
- append-ldflags $(no-as-needed)
-
- econf \
- --enable-largefile \
- $(use_enable glib glib2) \
- --disable-solaris \
- $(use_enable asyncns) \
- $(use_enable oss oss-output) \
- $(use_enable alsa) \
- $(use_enable lirc) \
- $(use_enable tcpd tcpwrap) \
- $(use_enable jack) \
- $(use_enable lirc) \
- $(use_enable avahi) \
- $(use_enable hal) \
- $(use_enable dbus) \
- $(use_enable gnome gconf) \
- $(use_enable libsamplerate samplerate) \
- $(use_enable bluetooth bluez) \
- $(use_enable X x11) \
- $(use_enable test default-build-tests) \
- $(use_enable udev) \
- $(use_enable ipv6) \
- $(use_with caps) \
- --localstatedir=/var \
- --with-realtime-group=realtime \
- --disable-per-user-esound-socket \
- || die "econf failed"
-
- if use doc; then
- pushd doxygen
- doxygen doxygen.conf || die
- popd
- fi
-}
-
-src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- emake -C src check || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
-
- use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${D}/etc/pulse/default.pa"
-
- if use hal && ! use udev; then
- sed -i -e 's:-udev:-hal:' "${D}/etc/pulse/default.pa" || die
- fi
-
- dodoc README ChangeLog todo || die
-
- if use doc; then
- pushd doxygen/html
- dohtml * || die
- popd
- fi
-
- # Create the state directory
- diropts -o pulse -g pulse -m0755
- keepdir /var/run/pulse
-
- find "${D}" -name '*.la' -delete
-}
-
-pkg_postinst() {
- elog "If you want to make use of realtime capabilities of PulseAudio"
- elog "you should follow the realtime guide to create and set up a realtime"
- elog "user group: http://www.gentoo.org/proj/en/desktop/sound/realtime.xml"
- elog "Make sure you also have baselayout installed with pam USE flag"
- elog "enabled, if you're using the rlimit method."
- if use bluetooth; then
- elog
- elog "The BlueTooth proximity module is not enabled in the default"
- elog "configuration file. If you do enable it, you'll have to have"
- elog "your BlueTooth controller enabled and inserted at bootup or"
- elog "PulseAudio will refuse to start."
- elog
- elog "Please note that the BlueTooth proximity module seems itself"
- elog "still experimental, so please report to upstream if you have"
- elog "problems with it."
- fi
- if use alsa &&
- has_version media-plugins/alsa-plugins &&
- ! has_version "media-plugins/alsa-plugins[pulseaudio]"; then
-
- elog
- elog "You have alsa support enabled so you probably want to install"
- elog "${pkg} with pulseaudio support to have"
- elog "alsa using applications route their sound through pulseaudio"
- fi
-
- eselect esd update --if-unset
-}