From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/, media-video/wireplumber/files/
Date: Fri, 14 Jan 2022 19:58:53 +0000 (UTC) [thread overview]
Message-ID: <1642190242.d20fea5200a3c33b1873f28cb48f7c3f658503d5.sam@gentoo> (raw)
commit: d20fea5200a3c33b1873f28cb48f7c3f658503d5
Author: Niklāvs Koļesņikovs <89q1r14hd <AT> relay <DOT> firefox <DOT> com>
AuthorDate: Fri Jan 14 18:25:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 19:57:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d20fea52
media-video/wireplumber: add fix for Pro Audio breaking PA routing
Signed-off-by: Niklāvs Koļesņikovs <89q1r14hd <AT> relay.firefox.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...default-nodes-handle-nodes-without-Routes.patch | 48 ++++++++++++++++++++++
...er-0.4.7.ebuild => wireplumber-0.4.7-r1.ebuild} | 4 ++
2 files changed, 52 insertions(+)
diff --git a/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch b/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch
new file mode 100644
index 000000000000..aeb5ce067615
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch
@@ -0,0 +1,48 @@
+From 211f1e6b6cd4898121e4c2b821fae4dea6cc3317 Mon Sep 17 00:00:00 2001
+From: Wim Taymans <wtaymans@redhat.com>
+Date: Fri, 14 Jan 2022 16:28:48 +0100
+Subject: [PATCH] default-nodes: handle nodes without Routes
+
+When a node has not part of any EnumRoute, we must assume it is
+available.
+
+Fixes selection of Pro Audio nodes as default nodes.
+---
+ modules/module-default-nodes.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
+index 32b2725b..15aadeaa 100644
+--- a/modules/module-default-nodes.c
++++ b/modules/module-default-nodes.c
+@@ -108,6 +108,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+ gint dev_id = dev_id_str ? atoi (dev_id_str) : -1;
+ gint cpd = cpd_str ? atoi (cpd_str) : -1;
+ g_autoptr (WpDevice) device = NULL;
++ gint found = 0;
+
+ if (dev_id == -1 || cpd == -1)
+ return TRUE;
+@@ -168,6 +169,7 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+ for (; wp_iterator_next (it, &v); g_value_unset (&v)) {
+ gint32 *d = (gint32 *)g_value_get_pointer (&v);
+ if (d && *d == cpd) {
++ found++;
+ if (route_avail != SPA_PARAM_AVAILABILITY_no)
+ return TRUE;
+ }
+@@ -175,6 +177,10 @@ node_has_available_routes (WpDefaultNodes * self, WpNode *node)
+ }
+ }
+ }
++ /* The node is part of a profile without routes so we assume it
++ * is available. This can happen for Pro Audio profiles */
++ if (found == 0)
++ return TRUE;
+
+ return FALSE;
+ }
+--
+GitLab
+
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/211f1e6b6cd4898121e4c2b821fae4dea6cc3317
diff --git a/media-video/wireplumber/wireplumber-0.4.7.ebuild b/media-video/wireplumber/wireplumber-0.4.7-r1.ebuild
similarity index 97%
rename from media-video/wireplumber/wireplumber-0.4.7.ebuild
rename to media-video/wireplumber/wireplumber-0.4.7-r1.ebuild
index 2e6c068b1ee9..bbd72a311e17 100644
--- a/media-video/wireplumber/wireplumber-0.4.7.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.7-r1.ebuild
@@ -54,6 +54,10 @@ RDEPEND="${DEPEND}"
DOCS=( {NEWS,README}.rst )
+PATCHES=(
+ "$FILESDIR"/${P}-default-nodes-handle-nodes-without-Routes.patch
+)
+
src_configure() {
local emesonargs=(
-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
next reply other threads:[~2022-01-14 19:58 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 19:58 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-28 12:08 [gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/, media-video/wireplumber/files/ Sam James
2024-09-17 20:00 Andreas Sturmlechner
2024-09-08 9:24 Sam James
2024-02-02 3:50 Sam James
2023-10-13 15:11 Sam James
2023-04-25 19:01 Sam James
2022-10-28 19:53 Sam James
2022-07-09 4:01 Sam James
2022-07-04 23:37 Sam James
2022-07-04 21:40 Sam James
2022-05-25 22:59 Sam James
2022-04-17 16:44 Sam James
2022-03-05 22:02 John Helmert III
2022-02-12 5:17 Sam James
2022-01-14 19:58 Sam James
2022-01-06 20:53 Sam James
2022-01-01 3:49 Sam James
2021-12-01 19:49 Sam James
2021-09-15 17:06 Sam James
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=1642190242.d20fea5200a3c33b1873f28cb48f7c3f658503d5.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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