Accepting request 987884 from home:favogt:branches:multimedia:libs

- Add patch to fix alsa device creation:
  * fix-alsa.patch

OBS-URL: https://build.opensuse.org/request/show/987884
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/wireplumber?expand=0&rev=48

fix-alsa.patch

@@ -0,0 +1,39 @@
+From c16e637c329bc9dda8544b18f5bd47a8d63ee253 Mon Sep 17 00:00:00 2001
+From: George Kiagiadakis <george.kiagiadakis@collabora.com>
+Date: Thu, 7 Jul 2022 20:58:36 +0300
+Subject: [PATCH] alsa: use "obj_type" as a variable name to avoid shadowing
+ lua's "type" function
+
+This causes a crash when running in a VM because the code tries to
+execute lua's "type()" and ends up executing the local string variable...
+
+Fixes: #303
+---
+ src/scripts/monitors/alsa.lua | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua
+index 43fab943..38f847f7 100644
+--- a/src/scripts/monitors/alsa.lua
++++ b/src/scripts/monitors/alsa.lua
+@@ -49,7 +49,7 @@ function nonempty(str)
+   return str ~= "" and str or nil
+ end
+ 
+-function createNode(parent, id, type, factory, properties)
++function createNode(parent, id, obj_type, factory, properties)
+   local dev_props = parent.properties
+ 
+   -- set the device id and spa factory name; REQUIRED, do not change
+@@ -199,7 +199,7 @@ function createDevice(parent, id, factory, properties)
+   end
+ end
+ 
+-function prepareDevice(parent, id, type, factory, properties)
++function prepareDevice(parent, id, obj_type, factory, properties)
+   -- ensure the device has an appropriate name
+   local name = "alsa_card." ..
+     (properties["device.name"] or
+-- 
+GitLab
+

wireplumber.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul  8 11:02:44 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Add patch to fix alsa device creation:
+  * fix-alsa.patch
+
 -------------------------------------------------------------------
 Tue Jul  5 15:13:07 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
 

wireplumber.spec

@@ -32,6 +32,8 @@ Source0:        wireplumber-%{version}.tar.xz
 Source1:        split-config-file.py
 # PATCH-FIX-OPENSUSE reduce-meson-required-version.patch
 Patch0:         reduce-meson-required-version.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         fix-alsa.patch
 # docs
 BuildRequires:  doxygen
 BuildRequires:  graphviz
@@ -140,6 +142,7 @@ the wireplumber shared library.
 %if 0%{?sle_version} == 150300
 %patch0 -p1
 %endif
+%patch1 -p1
 
 pushd src/config/main.lua.d
 python3 %{SOURCE1}