Re: [PR PATCH] [Updated] pipewire: update to 0.3.30.

[paper42 <paper42@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1031 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages pipewire-0.3.30
https://github.com/void-linux/void-packages/pull/31549

pipewire: update to 0.3.30.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

0.3.29 introduces `module-rt` which is supposed to replace rtkit on systems without it. I was able to make this work on my glibc system (replacing module-rtkit with module-rt in the configs and setting CAP_SYS_NICE on the binaries), but not on musl.

ping @ericonr, @st3r4g 

A patch file from https://github.com/void-linux/void-packages/pull/31549.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-0.3.30-31549.patch --]
[-- Type: text/x-diff, Size: 4915 bytes --]

From 75202ea61cc107c6669c4488320f8e6c3d765e59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 13 Jun 2021 18:51:51 +0200
Subject: [PATCH] pipewire: update to 0.3.30.

---
 srcpkgs/pipewire/patches/6df32666b4.patch     | 62 -------------------
 .../patches/fix-musl-rlimit-rttime.patch      | 13 ++++
 srcpkgs/pipewire/template                     |  5 +-
 3 files changed, 16 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/6df32666b4.patch
 create mode 100644 srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch

diff --git a/srcpkgs/pipewire/patches/6df32666b4.patch b/srcpkgs/pipewire/patches/6df32666b4.patch
deleted file mode 100644
index 8eea42116ad6..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 <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
-
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..8a6869228cfc
--- /dev/null
+++ b/srcpkgs/pipewire/patches/fix-musl-rlimit-rttime.patch
@@ -0,0 +1,13 @@
+--- src/modules/module-rt.c
++++ src/modules/module-rt.c
+@@ -49,6 +49,10 @@
+ 	"[rt.time.soft=<in usec: default " SPA_STRINGIFY(DEFAULT_RT_TIME_SOFT)"] " \
+ 	"[rt.time.hard=<in usec: default " SPA_STRINGIFY(DEFAULT_RT_TIME_HARD)"] "
+ 
++#ifndef RLIMIT_RTTIME
++#define RLIMIT_RTTIME 15
++#endif
++
+ static const struct spa_dict_item module_props[] = {
+ 	{ PW_KEY_MODULE_AUTHOR, "Jonas Holmberg <jonashg@axis.com>" },
+ 	{ PW_KEY_MODULE_DESCRIPTION, "Set thread priorities" },
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 43e3c1cfc9b4..0ad5ea7fb774 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,7 @@ 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
 
 build_options="sdl2"
 
@@ -150,6 +150,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
 	}
 }