From f5495cc84c995cff469dfb772161264b02c9e5c8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 20 Jun 2021 17:50:52 +0200 Subject: [PATCH] pipewire: update to 0.3.30. --- srcpkgs/pipewire/files/pipewire-pulse/run | 5 ++ srcpkgs/pipewire/files/pipewire/run | 5 ++ srcpkgs/pipewire/patches/6df32666b4.patch | 62 ------------------- .../patches/fix-musl-rlimit-rttime.patch | 13 ++++ srcpkgs/pipewire/template | 9 ++- 5 files changed, 30 insertions(+), 64 deletions(-) create mode 100644 srcpkgs/pipewire/files/pipewire-pulse/run create mode 100644 srcpkgs/pipewire/files/pipewire/run delete mode 100644 srcpkgs/pipewire/patches/6df32666b4.patch create mode 100644 srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run new file mode 100644 index 000000000000..b153926f4448 --- /dev/null +++ b/srcpkgs/pipewire/files/pipewire-pulse/run @@ -0,0 +1,5 @@ +#!/bin/sh +mkdir -p /run/pulse +chown pipewire:pipewire /run/pulse +umask 002 +PULSE_RUNTIME_PATH=/run exec chpst -u pipewire:pipewire pipewire-pulse diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run new file mode 100644 index 000000000000..65a602cf601b --- /dev/null +++ b/srcpkgs/pipewire/files/pipewire/run @@ -0,0 +1,5 @@ +#!/bin/sh +mkdir -p /run/pipewire +chown pipewire:pipewire /run/pipewire +umask 002 +PIPEWIRE_RUNTIME_DIR=/run/pipewire XDG_CONFIG_HOME=/var/lib chpst -u pipewire:pipewire:audio:video pipewire diff --git a/srcpkgs/pipewire/patches/6df32666b4.patch b/srcpkgs/pipewire/patches/6df32666b4.patch deleted file mode 100644 index ea42982b704e..000000000000 --- a/srcpkgs/pipewire/patches/6df32666b4.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6df32666b44b5174aace3dcff39f39a58eba508f Mon Sep 17 00:00:00 2001 -From: Wim Taymans -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 ---- a/src/modules/module-filter-chain.c -+++ b/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 - diff --git a/srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch b/srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch new file mode 100644 index 000000000000..27d477b5acc9 --- /dev/null +++ b/srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch @@ -0,0 +1,13 @@ +--- a/src/modules/module-rt.c ++++ b/src/modules/module-rt.c +@@ -49,6 +49,10 @@ + "[rt.time.soft=" }, + { PW_KEY_MODULE_DESCRIPTION, "Set thread priorities" }, diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 43e3c1cfc9b4..1e2a55143485 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.28 +version=0.3.30 revision=1 build_style=meson configure_args="-Dman=enabled -Dgstreamer=enabled -Ddocs=enabled -Dsystemd=disabled @@ -18,7 +18,9 @@ license="MIT" homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" -checksum=1d9271e121a5049aef379e9bb7c50524faa6f971e668806637d7b9df1b7cab88 +checksum=09a002a0846e168e8dc61b3aa579d38885aef32ac971351d5d3cde20bcd1759b +make_dirs="/var/lib/pipewire 0755 root root" +system_accounts="pipewire" build_options="sdl2" @@ -36,6 +38,8 @@ fi post_install() { vlicense LICENSE vdoc "${FILESDIR}/README.voidlinux" + vsv pipewire + vsv pipewire-pulse } libpipewire_package() { @@ -150,6 +154,7 @@ libjack-pipewire_package() { pkg_install() { vmove usr/lib/pipewire-0.3/jack vmove usr/bin/pw-jack + vmove usr/share/man/man1/pw-jack.1 } }