[arch-commits] Commit in libcanberra/trunk (PKGBUILD libcanberra-multi-backend.patch)

[Jan Steffens]

    Date: Wednesday, June 23, 2021 @ 19:48:39
  Author: heftig
Revision: 418666

0.30+2+gc0620e4-5: FS#71341

Added:
  libcanberra/trunk/libcanberra-multi-backend.patch
Modified:
  libcanberra/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   13 ++++++++++---
 libcanberra-multi-backend.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-23 18:30:33 UTC (rev 418665)
+++ PKGBUILD	2021-06-23 19:48:39 UTC (rev 418666)
@@ -2,7 +2,7 @@
 
 pkgname=libcanberra
 pkgver=0.30+2+gc0620e4
-pkgrel=4
+pkgrel=5
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 url="http://0pointer.de/lennart/projects/libcanberra"
 arch=(x86_64)
@@ -14,9 +14,11 @@
 options=(libtool)
 _commit=c0620e432650e81062c1967cc669829dbd29b310  # master
 source=("git+http://git.0pointer.net/clone/libcanberra.git#commit=$_commit"
-        40-libcanberra-gtk-module.sh)
+        40-libcanberra-gtk-module.sh
+        libcanberra-multi-backend.patch)
 sha256sums=('SKIP'
-            'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30')
+            'a0d0b135d3fea5c703a5f84208b79d66f671b082ae85f67b629ee2568a7ddc30'
+            'de146cae3e40a16b38c8edb4f1a3a423c64eb9c5000e36c316b677e9909c9b06')
 
 pkgver() {
   cd libcanberra
@@ -25,6 +27,11 @@
 
 prepare() {
   cd libcanberra
+
+  # https://bugs.archlinux.org/task/71341
+  # https://bugs.freedesktop.org/show_bug.cgi?id=51662
+  patch -Np1 -i ../libcanberra-multi-backend.patch
+
   ./autogen.sh
 }
 

Added: libcanberra-multi-backend.patch
===================================================================
--- libcanberra-multi-backend.patch	                        (rev 0)
+++ libcanberra-multi-backend.patch	2021-06-23 19:48:39 UTC (rev 418666)
@@ -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)))