From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pipewire: update to 0.3.30.
Date: Sun, 20 Jun 2021 22:57:09 +0200 [thread overview]
Message-ID: <20210620205709.xoGnhoPwh2wveRVwwtzBM-G3r-bV3iHz4ThNOXDVUa0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31549@inbox.vuxu.org>
[-- 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: 6218 bytes --]
From e66161b5e85788b64a1ad0598eca3b3b20052ba5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 20 Jun 2021 17:50:52 +0200
Subject: [PATCH] pipewire: update to 0.3.30.
---
srcpkgs/pipewire/files/pipewire-pulse/run | 4 ++
srcpkgs/pipewire/files/pipewire/run | 4 ++
srcpkgs/pipewire/patches/6df32666b4.patch | 62 -------------------
.../patches/fix-musl-rlimit-rttime.patch | 13 ++++
srcpkgs/pipewire/template | 9 ++-
5 files changed, 28 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..d5432d5091bf
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire-pulse/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+! [ -d /run/pulse ] && install -m 755 -g pipewire -o pipewire -d /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..91801942fad5
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+! [ -d /run/pipewire ] && install -m 755 -g pipewire -o pipewire -d /run/pipewire
+umask 002
+PIPEWIRE_RUNTIME_DIR=/run/pipewire XDG_CONFIG_HOME=/var/lib exec chpst -u pipewire:pipewire 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 <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
---- 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=<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..cd4900422d87 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 pipewire pipewire"
+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
}
}
next prev parent reply other threads:[~2021-06-20 20:57 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-17 21:52 [PR PATCH] " paper42
2021-06-18 2:55 ` ericonr
2021-06-18 10:46 ` st3r4g
2021-06-18 10:47 ` st3r4g
2021-06-18 10:49 ` st3r4g
2021-06-18 12:57 ` ericonr
2021-06-20 16:23 ` [PR PATCH] [Updated] " paper42
2021-06-20 16:28 ` paper42
2021-06-20 16:29 ` paper42
2021-06-20 16:30 ` paper42
2021-06-20 17:17 ` [PR REVIEW] " st3r4g
2021-06-20 17:17 ` st3r4g
2021-06-20 17:17 ` st3r4g
2021-06-20 17:17 ` st3r4g
2021-06-20 17:21 ` st3r4g
2021-06-20 17:21 ` st3r4g
2021-06-20 17:42 ` st3r4g
2021-06-20 17:44 ` cinerea0
2021-06-20 18:11 ` heliocat
2021-06-20 18:13 ` heliocat
2021-06-20 18:30 ` st3r4g
2021-06-20 20:57 ` paper42 [this message]
2021-06-20 20:57 ` paper42
2021-06-20 20:57 ` paper42
2021-06-20 20:59 ` [PR REVIEW] " paper42
2021-06-20 21:03 ` paper42
2021-06-20 21:23 ` st3r4g
2021-06-20 21:31 ` [PR REVIEW] " st3r4g
2021-06-20 21:35 ` st3r4g
2021-06-20 23:38 ` ericonr
2021-06-21 20:33 ` st3r4g
2021-06-21 21:46 ` st3r4g
2021-06-21 21:47 ` st3r4g
2021-06-21 21:48 ` st3r4g
2021-06-21 21:50 ` st3r4g
2021-06-25 20:55 ` [PR REVIEW] " st3r4g
2021-06-25 21:05 ` st3r4g
2021-06-25 22:38 ` st3r4g
2021-06-26 14:34 ` st3r4g
2021-06-26 14:35 ` st3r4g
2021-07-01 22:34 ` [PR PATCH] [Updated] " paper42
2021-07-01 22:36 ` [PR REVIEW] " paper42
2021-07-01 22:41 ` paper42
2021-07-02 9:37 ` [PR REVIEW] pipewire: update to 0.3.31 st3r4g
2021-07-02 11:43 ` st3r4g
2021-07-02 12:12 ` st3r4g
2021-07-02 12:14 ` st3r4g
2021-07-02 12:23 ` st3r4g
2021-07-02 12:39 ` st3r4g
2021-07-02 12:40 ` st3r4g
2021-07-02 13:03 ` st3r4g
2021-07-02 13:04 ` st3r4g
2021-07-02 13:28 ` st3r4g
2021-07-02 13:28 ` st3r4g
2021-07-02 15:00 ` [PR REVIEW] " st3r4g
2021-07-02 22:33 ` [PR PATCH] [Updated] " paper42
2021-07-02 22:40 ` paper42
2021-07-04 3:34 ` ericonr
2021-07-05 9:32 ` [PR PATCH] [Updated] " paper42
2021-07-05 17:13 ` st3r4g
2021-07-05 17:15 ` st3r4g
2021-07-05 17:28 ` st3r4g
2021-07-09 2:52 ` [PR REVIEW] " ericonr
2021-07-09 2:53 ` ericonr
2021-07-09 10:35 ` st3r4g
2021-07-09 10:36 ` st3r4g
2021-07-09 10:40 ` st3r4g
2021-07-09 10:44 ` st3r4g
2021-07-13 17:38 ` ericonr
2021-07-13 18:07 ` [PR PATCH] [Updated] " paper42
2021-07-13 18:07 ` [PR REVIEW] " paper42
2021-07-13 18:09 ` paper42
2021-07-14 14:11 ` [PR PATCH] [Merged]: " ericonr
2021-07-17 16:57 ` dkwo
2021-07-17 20:13 ` ericonr
2021-07-18 9:32 ` st3r4g
2021-07-18 10:26 ` dkwo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210620205709.xoGnhoPwh2wveRVwwtzBM-G3r-bV3iHz4ThNOXDVUa0@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).