[arch-commits] Commit in pulseaudio/trunk (PKGBUILD dont-require-dbus.patch)

[Jan Steffens]

    Date: Sunday, October 16, 2011 @ 04:38:53
  Author: heftig
Revision: 140516

add a patch to fix pulseaudio startup without dbus (e.g. console)

Added:
  pulseaudio/trunk/dont-require-dbus.patch
Modified:
  pulseaudio/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 +++++---
 dont-require-dbus.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-16 08:18:29 UTC (rev 140515)
+++ PKGBUILD	2011-10-16 08:38:53 UTC (rev 140516)
@@ -8,7 +8,7 @@
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=1.0
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://pulseaudio.org/"
 license=(GPL LGPL)
@@ -17,15 +17,17 @@
              lirc-utils openssl fftw orc json-c)
 options=(!emptydirs !libtool !makeflags)
 source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        $pkgbase.xinit version-number.patch)
+        $pkgbase.xinit version-number.patch dont-require-dbus.patch)
 sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
-            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530')
+            '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530'
+            '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
 
   patch -Np1 -i "$srcdir/version-number.patch"
+  patch -Np1 -i "$srcdir/dont-require-dbus.patch"
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \

Added: dont-require-dbus.patch
===================================================================
--- dont-require-dbus.patch	                        (rev 0)
+++ dont-require-dbus.patch	2011-10-16 08:38:53 UTC (rev 140516)
@@ -0,0 +1,46 @@
+commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f
+Author: Tanu Kaskinen <tanuk at iki.fi>
+Date:   Thu Oct 6 23:28:37 2011 +0300
+
+    daemon: Don't treat it as a fatal error if we can't connect to the session bus
+    
+    http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
+
+diff --git a/src/daemon/main.c b/src/daemon/main.c
+index e2e4a81..c32f7c7 100644
+--- a/src/daemon/main.c
++++ b/src/daemon/main.c
+@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
+ 
+ #ifdef HAVE_DBUS
+     if (!conf->system_instance) {
+-        if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
+-            goto finish;
+-        if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
+-            goto finish;
++        if ((server_lookup = pa_dbusobj_server_lookup_new(c))) {
++            if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
++                goto finish;
++        }
+     }
+ 
+-    if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server")))
+-        goto finish;
++    if (start_server)
++        server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
+ #endif
+ 
+ #ifdef HAVE_FORK
+diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c
+index 45796e7..9bdc699 100644
+--- a/src/daemon/server-lookup.c
++++ b/src/daemon/server-lookup.c
+@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
+     sl->path_registered = FALSE;
+ 
+     if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
+-        pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message);
++        pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
+         goto fail;
+     }
+