diff --git a/0001-alsa-use-obj_type-as-a-variable-name-to-avoid-shadow.patch b/0001-alsa-use-obj_type-as-a-variable-name-to-avoid-shadow.patch deleted file mode 100644 index b095f79..0000000 --- a/0001-alsa-use-obj_type-as-a-variable-name-to-avoid-shadow.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bc6b54229200537863426977c8d121bf9168fb94 Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis -Date: Thu, 7 Jul 2022 20:58:36 +0300 -Subject: [PATCH 1/2] 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 43fab94..38f847f 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 --- -2.36.1 - diff --git a/0002-dbus-fix-crash-when-trying-to-reconnect.patch b/0002-dbus-fix-crash-when-trying-to-reconnect.patch deleted file mode 100644 index 7734d84..0000000 --- a/0002-dbus-fix-crash-when-trying-to-reconnect.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 842e267af2925c5c0e8ea44b0f3d4e2823f787ce Mon Sep 17 00:00:00 2001 -From: George Kiagiadakis -Date: Wed, 13 Jul 2022 13:38:14 +0300 -Subject: [PATCH 2/2] dbus: fix crash when trying to reconnect - -When coming from on_sync_reconnect, data points to the WpDBus object -instead of the activation transition. - -Fixes: #305 ---- - lib/wp/dbus.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/lib/wp/dbus.c b/lib/wp/dbus.c -index 01a3b21..7c2d023 100644 ---- a/lib/wp/dbus.c -+++ b/lib/wp/dbus.c -@@ -58,14 +58,26 @@ wp_dbus_set_state (WpDbus *self, WpDBusState new_state) - static void - on_got_bus (GObject * obj, GAsyncResult * res, gpointer data) - { -- WpTransition *transition = WP_TRANSITION (data); -- WpDbus *self = wp_transition_get_source_object (transition); -+ WpTransition *transition; -+ WpDbus *self; - g_autoptr (GError) error = NULL; - -+ if (WP_IS_TRANSITION (data)) { -+ // coming from wp_dbus_enable -+ transition = WP_TRANSITION (data); -+ self = wp_transition_get_source_object (transition); -+ } else { -+ // coming from on_sync_reconnect -+ transition = NULL; -+ self = WP_DBUS (data); -+ } -+ - self->connection = g_dbus_connection_new_for_address_finish (res, &error); - if (!self->connection) { -- g_prefix_error (&error, "Failed to connect to bus: "); -- wp_transition_return_error (transition, g_steal_pointer (&error)); -+ if (transition) { -+ g_prefix_error (&error, "Failed to connect to bus: "); -+ wp_transition_return_error (transition, g_steal_pointer (&error)); -+ } - return; - } - --- -2.36.1 - diff --git a/sources b/sources index 59c9298..2e2d398 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wireplumber-0.4.11.tar.bz2) = 8a2bf0701f61604d7f85a30d7ac0d51aca4b95c21a335b662a8162bb7531d93f8c327da34ae13263920c863b695a5e0e372b4d17ae8323bf2634065ce93dd3af +SHA512 (wireplumber-0.4.14.tar.bz2) = 51dc830d4dfe000cf6091d728d9ce6248585f5fae729536d611f85a0981722b9ab7f13322b516dc9988cdc15e0859f946aa0b78a35ad13a67e2de8082e6d5549 diff --git a/wireplumber.spec b/wireplumber.spec index 2e4b650..e591c32 100644 --- a/wireplumber.spec +++ b/wireplumber.spec @@ -1,6 +1,6 @@ Name: wireplumber -Version: 0.4.11 -Release: 3%{?dist} +Version: 0.4.14 +Release: 1%{?dist} Summary: A modular session/policy manager for PipeWire License: MIT @@ -8,13 +8,12 @@ URL: https://pipewire.pages.freedesktop.org/wireplumber/ Source0: https://gitlab.freedesktop.org/pipewire/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 ## upstream patches -Patch0001: 0001-alsa-use-obj_type-as-a-variable-name-to-avoid-shadow.patch -Patch0002: 0002-dbus-fix-crash-when-trying-to-reconnect.patch ## upstreamable patches ## fedora patches +BuildRequires: gettext BuildRequires: meson gcc pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -77,6 +76,8 @@ managing PipeWire. # Create local config skeleton mkdir -p %{buildroot}%{_sysconfdir}/wireplumber/{bluetooth.lua.d,common,main.lua.d,policy.lua.d} +%find_lang %{name} + %posttrans %systemd_user_post %{name}.service @@ -103,7 +104,7 @@ fi %{_userunitdir}/wireplumber.service %{_userunitdir}/wireplumber@.service -%files libs +%files libs -f %{name}.lang %license LICENSE %dir %{_libdir}/wireplumber-0.4/ %{_libdir}/wireplumber-0.4/libwireplumber-*.so @@ -117,6 +118,18 @@ fi %{_datadir}/gir-1.0/Wp-0.4.gir %changelog +* Thu Mar 9 2023 Wim Taymans - 0.4.14-1 +- wireplumber 0.4.14 + +* Tue Dec 13 2022 Wim Taymans - 0.4.13-1 +- wireplumber 0.4.13 + +* Fri Oct 07 2022 Wim Taymans - 0.4.12-1 +- wireplumber 0.4.12 + +* Thu Aug 04 2022 Ville-Pekka Vainio - 0.4.11-4 +- Add two patches to fix a rescan loop with Bluetooth + * Sat Jul 23 2022 Fedora Release Engineering - 0.4.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild