diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-12-06 17:34:45 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-12-06 17:34:45 +0000 |
| commit | bd37e016fe6af4c4f01efd95e110a8cda5fbedcb (patch) | |
| tree | 7d86e06e26bfce422bc06399db71f55afdd5aace /media-sound/pulseaudio/files | |
| parent | Bump once again the experimental version of PulseAudio. (diff) | |
| download | gentoo-2-bd37e016fe6af4c4f01efd95e110a8cda5fbedcb.tar.gz gentoo-2-bd37e016fe6af4c4f01efd95e110a8cda5fbedcb.tar.bz2 gentoo-2-bd37e016fe6af4c4f01efd95e110a8cda5fbedcb.zip | |
Allow selection for global or per-user ESD socket directory. Fixes bug #199507.
(Portage version: 2.1.4_rc6)
Diffstat (limited to 'media-sound/pulseaudio/files')
| -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.patch | 49 |
3 files changed, 49 insertions, 0 deletions
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) |