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

Accepting request 1009051 from home:XRevan86

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1009051
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=79
This commit is contained in:
Takashi Iwai 2022-10-11 10:22:55 +00:00 committed by Git OBS Bridge
parent b3821f3aae
commit 6652ea7d47
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
0001-filter-chain-iterate-the-port-correctly.patch Normal file
View File

@ -0,0 +1,40 @@
From 94a64268613adac8ef6f3e6c1f04468220540d00 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 3 Oct 2022 09:55:44 +0200
Subject: [PATCH] filter-chain: iterate the port correctly
Don't use the number of handles to iterate the output ports but the
number of output ports on the node.
Fixes #2737
---
src/modules/module-filter-chain.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 6a899ef5f..9d65aa938 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -1561,6 +1561,10 @@ static int load_node(struct graph *graph, struct spa_json *json)
node->control_port = calloc(desc->n_control, sizeof(struct port));
node->notify_port = calloc(desc->n_notify, sizeof(struct port));
+ pw_log_info("loaded n_input:%d n_output:%d n_control:%d n_notify:%d",
+ desc->n_input, desc->n_output,
+ desc->n_control, desc->n_notify);
+
for (i = 0; i < desc->n_input; i++) {
struct port *port = &node->input_port[i];
port->node = node;
@@ -1953,6 +1957,8 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
gh->hndl = &node->hndl[i];
gh->desc = d;
+ }
+ for (i = 0; i < desc->n_output; i++) {
spa_list_for_each(link, &node->output_port[i].link_list, output_link)
link->input->node->n_deps--;
}
--
2.37.3

6
pipewire.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Oct 8 20:46:58 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
- Add 0001-filter-chain-iterate-the-port-correctly.patch: Fix
filter-chain convolver segfault at start.
-------------------------------------------------------------------
Sat Oct 1 18:25:10 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>

3
pipewire.spec
View File

@ -64,6 +64,8 @@ Source0: %{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE reduce-meson-dependency.patch
Patch0: reduce-meson-dependency.patch
# PATCH-FIX-UPSTREAM 0001-filter-chain-iterate-the-port-correctly.patch
Patch1: 0001-filter-chain-iterate-the-port-correctly.patch
BuildRequires: docutils
BuildRequires: doxygen
BuildRequires: fdupes
@ -335,6 +337,7 @@ This package provides a PulseAudio implementation based on PipeWire
%if 0%{?sle_version} <= 150300
%patch0 -p1
%endif
%patch1 -p1
%build
%if %{pkg_vcmp gcc < 8}