Accepting request 126954 from home:dimstar:branches:GNOME:Factory

Fix event sounds when pulse is disabled... should also go to 12.2

OBS-URL: https://build.opensuse.org/request/show/126954
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libcanberra?expand=0&rev=51

libcanberra-multi-backend.patch

@@ -0,0 +1,26 @@
+Index: libcanberra-0.29/src/driver-order.c
+===================================================================
+--- libcanberra-0.29.orig/src/driver-order.c
++++ libcanberra-0.29/src/driver-order.c
+@@ -30,6 +30,7 @@
+ #include "driver-order.h"
+ 
+ const char* const ca_driver_order[] = {
++	"multi",
+ #ifdef HAVE_PULSE
+         "pulse",
+ #endif
+Index: libcanberra-0.29/src/multi.c
+===================================================================
+--- libcanberra-0.29.orig/src/multi.c
++++ libcanberra-0.29/src/multi.c
+@@ -107,8 +107,7 @@ int driver_open(ca_context *c) {
+         int ret = CA_SUCCESS;
+ 
+         ca_return_val_if_fail(c, CA_ERROR_INVALID);
+-        ca_return_val_if_fail(c->driver, CA_ERROR_NODRIVER);
+-        ca_return_val_if_fail(!strncmp(c->driver, "multi", 5), CA_ERROR_NODRIVER);
++        ca_return_val_if_fail(!c->driver || strncmp(c->driver, "multi", 5) == 0, CA_ERROR_NODRIVER);
+         ca_return_val_if_fail(!PRIVATE(c), CA_ERROR_STATE);
+ 
+         if (!(c->private = p = ca_new0(struct private, 1)))

libcanberra.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul  2 19:19:56 UTC 2012 - dimstar@opensuse.org
+
+- Add libcanberra-multi-backend.patch: Set the 'multi'-backend as
+  default and fix it to also work without the driver list being
+  passed from the command line. Fixes bnc#763243.
+
 -------------------------------------------------------------------
 Mon Jul  2 09:51:09 UTC 2012 - dimstar@opensuse.org
 

libcanberra.spec

@@ -28,6 +28,8 @@ Url:            http://0pointer.de/lennart/projects/libcanberra/
 Source:         http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz
 Source1:        libcanberra-gtk-module.sh
 Source99:       baselibs.conf
+#PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch bnc#753243 dimstar@opensuse.org -- Set the multi backend as default and allow it actually to work.
+Patch0:         libcanberra-multi-backend.patch
 BuildRequires:  gtk-doc
 BuildRequires:  libltdl-devel
 BuildRequires:  lynx
@@ -179,6 +181,7 @@ This package provides the development files for libcanberra.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1