Accepting request 1218008 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/1218008
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pipewire?expand=0&rev=126
This commit is contained in:
2024-10-25 17:18:52 +00:00
committed by Git OBS Bridge
8 changed files with 52 additions and 72 deletions

View File

@@ -1,25 +0,0 @@
From abfec78c51e36885eccd6f63e07706e758557dae Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Sat, 12 Oct 2024 13:32:44 +0300
Subject: [PATCH] bluez5: fix crash with broadcast sinks
---
spa/plugins/bluez5/bluez5-dbus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spa/plugins/bluez5/bluez5-dbus.c b/spa/plugins/bluez5/bluez5-dbus.c
index 27d21bb9c4..19d365c41a 100644
--- a/spa/plugins/bluez5/bluez5-dbus.c
+++ b/spa/plugins/bluez5/bluez5-dbus.c
@@ -5504,7 +5504,7 @@ static void interface_added(struct spa_bt_monitor *monitor,
spa_autofree char *local_endpoint = NULL;
/* get local endpoint */
- for (i = 0; monitor->media_codecs; i++) {
+ for (i = 0; monitor->media_codecs[i]; i++) {
if (!monitor->media_codecs[i]->bap)
continue;
if (!is_media_codec_enabled(monitor, monitor->media_codecs[i]))
--
GitLab

View File

@@ -1,36 +0,0 @@
From 885f8ab517365295e1c0651702a85c1324eb35db Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Sun, 6 Oct 2024 12:36:18 +0200
Subject: [PATCH] jack: actually clear the mix io
When we are asked to clear the mix io areas, actually do it, otherwise
the process thread might still be accessing the old memory and crash.
Also check that we have set io on the port before we decrement the
counter with active io or else we have a negative value and cause
problems later. This can happen when we susupend and set io to NULL but
there was never any io set on the port.
Fixes #4337
---
pipewire-jack/src/pipewire-jack.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c
index 1adfa22252..ccca290065 100644
--- a/pipewire-jack/src/pipewire-jack.c
+++ b/pipewire-jack/src/pipewire-jack.c
@@ -600,7 +600,9 @@ do_mix_set_io(struct spa_loop *loop, bool async, uint32_t seq,
port->global_mix->io[1] = &port->io[1];
}
} else {
- if (--port->n_mix == 0 && port->global_mix != NULL) {
+ info->mix->io[0] = NULL;
+ info->mix->io[1] = NULL;
+ if (port->n_mix > 0 && --port->n_mix == 0 && port->global_mix != NULL) {
port->global_mix->io[0] = NULL;
port->global_mix->io[1] = NULL;
}
--
GitLab

View File

@@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param name="url">https://gitlab.freedesktop.org/pipewire/pipewire.git</param>
<param name="revision">1.2.5</param>
<param name="revision">1.2.6</param>
<param name="versionformat">@PARENT_TAG@</param>
<!--
<param name="revision">60deeb25558a794e6e664bb832318b87958c18ea</param>

BIN
pipewire-1.2.5.obscpio (Stored with Git LFS)

Binary file not shown.

3
pipewire-1.2.6.obscpio Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:727bc8f1e6524656c76bb8e6d68933d3cba788f453acbd446d8bdca4df74aabf
size 13218829

View File

@@ -1,3 +1,46 @@
-------------------------------------------------------------------
Thu Oct 24 09:54:34 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
- Update to version 1.2.6:
+ Highlights
- The filter-chain param changes were not aggregated correctly,
causing some param changes to be ignored. (#4331)
- Clear the JACK io ports correctly when stopping to avoid
crashes. (#4337)
- Some more small fixes and improvements.
+ PipeWire
- Stream states are now updated based on the underlying node
state.
- Exported nodes now have their state change done synchronously
so that the server can immediately start the driver and avoid
some initial xruns.
- Improve stream flush handling and improve the docs.
- Don't send mix_info to destroyed ports to avoid some errors
in the JACK clients.
+ Modules
- The filter-chain param changes were not aggregated correctly,
causing some param changes to be ignored. (#4331)
- The filter-chain now correctly optimizes unlinked nodes in
all cases.
+ SPA
- ALSA PCM node properties are now no longer overwritten with
card properties. (#4135)
- Increase the adapter retry count to avoid xruns in some
cases. (#4334)
- Fix potential crash in cleanup of ALSA nodes.
+ Bluetooth
- Fix a crash with broadcast sinks.
- Improve compatibility with Phonak hearing aids.
- Don't exit when DBus goes down.
+ JACK
- Clear the io ports correctly when stopping to avoid crashes.
(#4337)
+ Docs
- Backport docs from master.
- Drop patches already included in upstream:
* 0001-bluez5-fix-crash-with-broadcast-sinks.patch
* 0002-jack-actually-clear-the-mix-io.patch
-------------------------------------------------------------------
Mon Oct 21 17:41:07 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>

View File

@@ -1,4 +1,4 @@
name: pipewire
version: 1.2.5
mtime: 1727431340
commit: 71fac7fa818f21234da4c356de0b44e47e1a2ef2
version: 1.2.6
mtime: 1729669450
commit: 79eebcb72490484e25208971ca15b9e0ea25bd95

View File

@@ -68,7 +68,7 @@
%bcond_with aptx
Name: pipewire
Version: 1.2.5
Version: 1.2.6
Release: 0
Summary: A Multimedia Framework designed to be an audio and video server and more
License: MIT
@@ -78,8 +78,6 @@ Source0: %{name}-%{version}.tar.zst
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE reduce-meson-dependency.patch
Patch0: reduce-meson-dependency.patch
Patch1: 0001-bluez5-fix-crash-with-broadcast-sinks.patch
Patch2: 0002-jack-actually-clear-the-mix-io.patch
BuildRequires: docutils
%if 0%{suse_version} > 1500
@@ -661,7 +659,7 @@ fi
%{_mandir}/man5/pipewire-filter-chain.conf.5%{?ext_man}
%{_mandir}/man5/pipewire.conf.5%{?ext_man}
%{_mandir}/man5/pipewire-jack.conf.5%{?ext_man}
%{_mandir}/man7/pipewire-devices.7%{?ext_man}
%{_mandir}/man7/pipewire-props.7%{?ext_man}
%dir %{_datadir}/pipewire/
%{_datadir}/pipewire/pipewire.conf