wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-09 00:23:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

pipewire: update to 0.3.28

Browse source 
Default config files moved to /usr/share
This commit is contained in:
Stefano Ragni 2021-05-20 13:13:52 +02:00 • committed by Érico Nogueira Rolim
parent 903f45e1a0
commit 953d4e02e7
2 changed files with 64 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
srcpkgs/pipewire/patches/6df32666b4.patch Normal file
View file

@ -0,0 +1,62 @@
From 6df32666b44b5174aace3dcff39f39a58eba508f Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 20 May 2021 11:22:04 +0200
Subject: [PATCH] filter-chain: check external ports only once
When we duplicate the pipeline to match the channels, only check
if a port was used only once for the first instance. Makes
demonic filter work again.
---
src/modules/module-filter-chain.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index b1e727069..bb346b6d8 100644
--- src/modules/module-filter-chain.c
+++ src/modules/module-filter-chain.c
@@ -972,16 +972,6 @@ static int parse_link(struct graph *graph, struct spa_json *json)
pw_log_error("unknown input port %s", input);
return -ENOENT;
}
- if (in_port->external != SPA_ID_INVALID) {
- pw_log_info("%s already used as graph input %d, use mixer",
- input, in_port->external);
- return -EINVAL;
- }
- if (out_port->external != SPA_ID_INVALID) {
- pw_log_info("%s already used as graph output %d, use copy",
- output, out_port->external);
- return -EINVAL;
- }
if (in_port->n_links > 0) {
pw_log_info("Can't have more than 1 link to %s, use a mixer", input);
return -ENOTSUP;
@@ -1334,10 +1324,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} else {
desc = port->node->desc;
d = desc->desc;
- if (port->external != SPA_ID_INVALID) {
+ if (i == 0 && port->external != SPA_ID_INVALID) {
pw_log_error("input port %s[%d]:%s already used as input %d, use mixer",
port->node->name, i, d->PortNames[port->p],
- graph->n_input);
+ port->external);
res = -EBUSY;
goto error;
}
@@ -1382,10 +1372,10 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
} else {
desc = port->node->desc;
d = desc->desc;
- if (port->external != SPA_ID_INVALID) {
+ if (i == 0 && port->external != SPA_ID_INVALID) {
pw_log_error("output port %s[%d]:%s already used as output %d, use copy",
port->node->name, i, d->PortNames[port->p],
- graph->n_output);
+ port->external);
res = -EBUSY;
goto error;
}
--
GitLab

5
srcpkgs/pipewire/template
View file

@ -1,6 +1,6 @@
# Template file for 'pipewire' # Template file for 'pipewire'
pkgname=pipewire pkgname=pipewire
version=0.3.27 version=0.3.28
revision=1 revision=1
build_style=meson build_style=meson
configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled
@ -18,8 +18,7 @@ license="MIT"
homepage="https://pipewire.org/" homepage="https://pipewire.org/"
changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz"
checksum=657db1b9a29ae17a9f1d9782a45bda2ba5a893fef55e1ca26453e8f7f2d4e64e checksum=1d9271e121a5049aef379e9bb7c50524faa6f971e668806637d7b9df1b7cab88
conf_files="/etc/pipewire/*.conf /etc/pipewire/media-session.d/*.conf"
build_options="sdl2" build_options="sdl2"