Hello community, here is the log from the commit of package libcanberra for openSUSE:Factory checked in at 2012-07-03 13:57:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcanberra (Old) and /work/SRC/openSUSE:Factory/.libcanberra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcanberra", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libcanberra/libcanberra.changes 2012-07-02 21:24:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcanberra.new/libcanberra.changes 2012-07-03 13:57:20.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 2 19:19:56 UTC 2012 - [email protected] + +- 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. + +------------------------------------------------------------------- New: ---- libcanberra-multi-backend.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcanberra.spec ++++++ --- /var/tmp/diff_new_pack.F1U3F8/_old 2012-07-03 13:57:21.000000000 +0200 +++ /var/tmp/diff_new_pack.F1U3F8/_new 2012-07-03 13:57:21.000000000 +0200 @@ -28,6 +28,8 @@ 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 [email protected] -- 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 @@ %prep %setup -q +%patch0 -p1 %build %configure --with-pic --disable-static --enable-pulse --enable-alsa --enable-null --with-builtin=dso V=1 ++++++ libcanberra-multi-backend.patch ++++++ 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))) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
