summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-12-06 17:34:45 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-12-06 17:34:45 +0000
commit0e6cbb0d37e0e972a06d56b4f19e456448c63b51 (patch)
tree67c4d83f7444ffd7ba53638a6d78711c7b1646ec
parentBump once again the experimental version of PulseAudio. (diff)
downloadhistorical-0e6cbb0d37e0e972a06d56b4f19e456448c63b51.tar.gz
historical-0e6cbb0d37e0e972a06d56b4f19e456448c63b51.tar.bz2
historical-0e6cbb0d37e0e972a06d56b4f19e456448c63b51.zip
Allow selection for global or per-user ESD socket directory. Fixes bug #199507.
Package-Manager: portage-2.1.4_rc6
-rw-r--r--media-sound/pulseaudio/ChangeLog11
-rw-r--r--media-sound/pulseaudio/Manifest46
-rw-r--r--media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r2 (renamed from media-sound/pulseaudio/files/digest-pulseaudio-0.9.8)0
-rw-r--r--media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r3 (renamed from media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1)0
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch49
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.8-r2.ebuild (renamed from media-sound/pulseaudio/pulseaudio-0.9.8.ebuild)3
-rw-r--r--media-sound/pulseaudio/pulseaudio-0.9.8-r3.ebuild (renamed from media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild)3
7 files changed, 88 insertions, 24 deletions
diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 0e8df3895553..122e5b805173 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for media-sound/pulseaudio
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.77 2007/11/27 11:16:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.78 2007/12/06 17:34:44 flameeyes Exp $
+
+*pulseaudio-0.9.8-r3 (06 Dec 2007)
+*pulseaudio-0.9.8-r2 (06 Dec 2007)
+
+ 06 Dec 2007; Diego Pettenò <flameeyes@gentoo.org>
+ +files/pulseaudio-0.9.8-esoundpath.patch, -pulseaudio-0.9.8.ebuild,
+ -pulseaudio-0.9.8-r1.ebuild, +pulseaudio-0.9.8-r2.ebuild,
+ +pulseaudio-0.9.8-r3.ebuild:
+ Allow selection for global or per-user ESD socket directory. Fixes bug #199507.
27 Nov 2007; Markus Meier <maekke@gentoo.org> pulseaudio-0.9.7.ebuild:
x86 stable, bug #197126
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 1898315aaf26..762c14d207ff 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -29,6 +29,10 @@ AUX pulseaudio-0.9.8-bt-nohal.patch 1153 RMD160 5ad7a7173795c022fca73ccf694207e1
MD5 2770bc498e4ffe3d03ebae7916166a59 files/pulseaudio-0.9.8-bt-nohal.patch 1153
RMD160 5ad7a7173795c022fca73ccf694207e18d6925a7 files/pulseaudio-0.9.8-bt-nohal.patch 1153
SHA256 1bdc458d55529777a3a760205a09d0381433402a3002518ba5a700b3518c727d files/pulseaudio-0.9.8-bt-nohal.patch 1153
+AUX pulseaudio-0.9.8-esoundpath.patch 1798 RMD160 c009c0d1cfdf0bb9db6ef476df29bca56b68ab58 SHA1 5901b164c5b4bd3fa485dbc1a5a950f2ba5794a9 SHA256 4ae132c68a19f07ecf1fef9c55cebc7615e38b157dc196961f666c3914a4641b
+MD5 390d56bb9582b45e9138c7329c0a2a67 files/pulseaudio-0.9.8-esoundpath.patch 1798
+RMD160 c009c0d1cfdf0bb9db6ef476df29bca56b68ab58 files/pulseaudio-0.9.8-esoundpath.patch 1798
+SHA256 4ae132c68a19f07ecf1fef9c55cebc7615e38b157dc196961f666c3914a4641b files/pulseaudio-0.9.8-esoundpath.patch 1798
AUX pulseaudio-0.9.8-polkit.patch 766 RMD160 20bafbeae68fb9092dd3ef2d6d7facca86091d42 SHA1 490aeea34db54e779b84e9922bdb372e1cdcde7e SHA256 112d4da6597783e4dd3d69b73fe08c91631e280b23e84a41c2f1f8b3d9c8d368
MD5 691950169a889326e4ef2a96bd7ab176 files/pulseaudio-0.9.8-polkit.patch 766
RMD160 20bafbeae68fb9092dd3ef2d6d7facca86091d42 files/pulseaudio-0.9.8-polkit.patch 766
@@ -65,18 +69,18 @@ EBUILD pulseaudio-0.9.7.ebuild 4759 RMD160 cf3a5df10adf471f71fc3d333701221fc71ae
MD5 59e3e872703f2f968345fbbac274f577 pulseaudio-0.9.7.ebuild 4759
RMD160 cf3a5df10adf471f71fc3d333701221fc71ae49f pulseaudio-0.9.7.ebuild 4759
SHA256 d0763110ad81763a4e3ea2ef75fd0b02032cbdef1676a527d35148fdb8df1e98 pulseaudio-0.9.7.ebuild 4759
-EBUILD pulseaudio-0.9.8-r1.ebuild 5629 RMD160 aaf38b74cd9e20b7851ab878c40c3d985fe60ac8 SHA1 15924cfb8eb7a987e476a0c4a7208e81e7832eb8 SHA256 1e482351cb68453214a9ea4fada8503bb2e9f1e6a0e84e9f162f60c0376eca93
-MD5 2c29b0d72749d708d74e54247f5863d1 pulseaudio-0.9.8-r1.ebuild 5629
-RMD160 aaf38b74cd9e20b7851ab878c40c3d985fe60ac8 pulseaudio-0.9.8-r1.ebuild 5629
-SHA256 1e482351cb68453214a9ea4fada8503bb2e9f1e6a0e84e9f162f60c0376eca93 pulseaudio-0.9.8-r1.ebuild 5629
-EBUILD pulseaudio-0.9.8.ebuild 5664 RMD160 d51102d566a1214f363ee7e1b2062e8bc8abd2a8 SHA1 c2890c43d503cbcce20b154428bb132d01a0d38a SHA256 1b2846fba4e3b9034b8b82a70da55a25639d33af7785e0202d186935c8f68295
-MD5 60ac415bad3a9212c609db5bf863eba0 pulseaudio-0.9.8.ebuild 5664
-RMD160 d51102d566a1214f363ee7e1b2062e8bc8abd2a8 pulseaudio-0.9.8.ebuild 5664
-SHA256 1b2846fba4e3b9034b8b82a70da55a25639d33af7785e0202d186935c8f68295 pulseaudio-0.9.8.ebuild 5664
-MISC ChangeLog 13989 RMD160 58409e14dd4ef03be2c444d3a687335d44b228e3 SHA1 b29c7167b1dc1105922085e84f236ea2cbfcf72f SHA256 b339c52dd79b665aaf11b60d898efd4c2dfff521a22df3adf90ab215f15a1092
-MD5 e9b33ac215a0d16980feaf5988ea93c0 ChangeLog 13989
-RMD160 58409e14dd4ef03be2c444d3a687335d44b228e3 ChangeLog 13989
-SHA256 b339c52dd79b665aaf11b60d898efd4c2dfff521a22df3adf90ab215f15a1092 ChangeLog 13989
+EBUILD pulseaudio-0.9.8-r2.ebuild 5711 RMD160 47842392436f019951fde578de70015920a7dd7f SHA1 5c0424305a926bf1cd1cde75c837f62ca544f987 SHA256 2e6fdff8f1f4b7bfd1a819d31c201bcf89aa4ebdfc5bb581130e119ec5eae836
+MD5 636cf832f15595154024194da3e5a780 pulseaudio-0.9.8-r2.ebuild 5711
+RMD160 47842392436f019951fde578de70015920a7dd7f pulseaudio-0.9.8-r2.ebuild 5711
+SHA256 2e6fdff8f1f4b7bfd1a819d31c201bcf89aa4ebdfc5bb581130e119ec5eae836 pulseaudio-0.9.8-r2.ebuild 5711
+EBUILD pulseaudio-0.9.8-r3.ebuild 5673 RMD160 ff3d8a68e2cdbd80657782a58f41b5d5e06e3190 SHA1 594eef4db22091169e07b7e5c530226039e7dafe SHA256 d83df8e2008f4c11257f73a97f263734e48c0e711b6cae6c24899a882e2b8c5c
+MD5 7ffa81b2358b9002be79d4db7765469e pulseaudio-0.9.8-r3.ebuild 5673
+RMD160 ff3d8a68e2cdbd80657782a58f41b5d5e06e3190 pulseaudio-0.9.8-r3.ebuild 5673
+SHA256 d83df8e2008f4c11257f73a97f263734e48c0e711b6cae6c24899a882e2b8c5c pulseaudio-0.9.8-r3.ebuild 5673
+MISC ChangeLog 14360 RMD160 e51199589638dc883ff7f65a27ded2036bf58738 SHA1 3321e9d4e00dc58c20b2681cff9df86378ac949f SHA256 237a8f798ead5a7f8abfc0d76c4c1e1b3f725f0a130406596a31bf9dbc777404
+MD5 4845252578b8ad154e837befa7c10703 ChangeLog 14360
+RMD160 e51199589638dc883ff7f65a27ded2036bf58738 ChangeLog 14360
+SHA256 237a8f798ead5a7f8abfc0d76c4c1e1b3f725f0a130406596a31bf9dbc777404 ChangeLog 14360
MISC metadata.xml 927 RMD160 f356067c159b3c1f767acc9d4cae0a7d08594f92 SHA1 d33063c255d3623824ed1738e645030499100320 SHA256 fc48d35d1b5412086fdb1a110855d46da5227f9948e6d833555404557c10c9a6
MD5 411dece56551d80e6fdf2cf1f42e7de5 metadata.xml 927
RMD160 f356067c159b3c1f767acc9d4cae0a7d08594f92 metadata.xml 927
@@ -90,16 +94,16 @@ SHA256 589a5d35f77e204519dca87c60cd887406b4c55a755afcd7975a5b392c994ab7 files/di
MD5 bb5084148a466cd7ac637deea6c190b8 files/digest-pulseaudio-0.9.7 253
RMD160 66290b7baa73f06a9959116e7cb200f47106d97a files/digest-pulseaudio-0.9.7 253
SHA256 6231728210138f08066ebcb131dde341500e592d659c10012ac9a9008b7c3da2 files/digest-pulseaudio-0.9.7 253
-MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8 253
-RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8 253
-SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8 253
-MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r1 253
-RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r1 253
-SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r1 253
+MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r2 253
+RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r2 253
+SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r2 253
+MD5 4d91e7eeb785ff03ad20f30e1bc59118 files/digest-pulseaudio-0.9.8-r3 253
+RMD160 fe718f55780ba439e718786e40496ac23a1d989f files/digest-pulseaudio-0.9.8-r3 253
+SHA256 163458e04049a24ab1dcfcc110dd4eea8a1e0fa2e8c26811e9502842e97928cd files/digest-pulseaudio-0.9.8-r3 253
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHS/zGkKaRLQcq0GIRAiymAKCth9VoHEyYC9kPjHJb/jEBPlVYqQCfblve
-Jd8tnnQOqbE9I110vN8E/mQ=
-=H+dm
+iD8DBQFHWDLCAiZjviIA2XgRAmUIAKDDl6BRqLIb7acs7IenDocBj2dKjwCeOBNM
+4NJcN8I941uvKUcHcomoJrE=
+=vYvq
-----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r2
index 9f89ccdd6357..9f89ccdd6357 100644
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r2
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r3
index 9f89ccdd6357..9f89ccdd6357 100644
--- a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r1
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.8-r3
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch
new file mode 100644
index 000000000000..317d39a59cb3
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.8-esoundpath.patch
@@ -0,0 +1,49 @@
+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/pulseaudio-0.9.8.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.8-r2.ebuild
index 0d716a559da3..289dd92a80f3 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.8-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8.ebuild,v 1.2 2007/11/23 15:47:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r2.ebuild,v 1.1 2007/12/06 17:34:44 flameeyes Exp $
inherit eutils libtool autotools
@@ -73,6 +73,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-svn2074.patch"
epatch "${FILESDIR}/${P}-polkit.patch"
epatch "${FILESDIR}/${P}-bt-nohal.patch"
+ epatch "${FILESDIR}/${P}-esoundpath.patch"
eautoreconf
elibtoolize
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.8-r3.ebuild
index a7de23858ca3..1d3aaf98d528 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.8-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r1.ebuild,v 1.2 2007/11/23 15:47:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.8-r3.ebuild,v 1.1 2007/12/06 17:34:44 flameeyes Exp $
inherit eutils libtool autotools
@@ -75,6 +75,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-svn2074.patch"
epatch "${FILESDIR}/${P}-polkit.patch"
epatch "${FILESDIR}/${P}-bt-nohal.patch"
+ epatch "${FILESDIR}/${P}-esoundpath.patch"
eautoreconf
elibtoolize