Allow selection for global or per-user ESD socket directory. Fixes bug #199507.

(Portage version: 2.1.4_rc6)

6 files changed, 63 insertions, 3 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/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