pool/libcanberra
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2012-07-03 10:04:10 +00:00 committed by Git OBS Bridge
parent a598dbe24a
commit e472742099
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libcanberra-multi-backend.patch Normal file
View File

@ -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)))

7
libcanberra.changes
View File

@ -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

3
libcanberra.spec
View File

@ -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