From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE706158087 for ; Fri, 14 Jan 2022 19:58:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB51A2BC01D; Fri, 14 Jan 2022 19:58:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 12FAD2BC007 for ; Fri, 14 Jan 2022 19:58:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F109E343498 for ; Fri, 14 Jan 2022 19:58:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56E8AA5 for ; Fri, 14 Jan 2022 19:58:53 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642190242.d20fea5200a3c33b1873f28cb48f7c3f658503d5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/wireplumber/, media-video/wireplumber/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/wireplumber/files/wireplumber-0.4.7-default-nodes-handle-nodes-without-Routes.patch media-video/wireplumber/wireplumber-0.4.7-r1.ebuild media-video/wireplumber/wireplumber-0.4.7.ebuild X-VCS-Directories: media-video/wireplumber/files/ media-video/wireplumber/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d20fea5200a3c33b1873f28cb48f7c3f658503d5 X-VCS-Branch: master Date: Fri, 14 Jan 2022 19:58:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a04c6905-5e0c-4c4a-9453-f687758376e5 X-Archives-Hash: a0c3b7fe3c4af508659ca8f540d513c7 commit: d20fea5200a3c33b1873f28cb48f7c3f658503d5 Author: Niklāvs Koļesņikovs <89q1r14hd relay firefox com> AuthorDate: Fri Jan 14 18:25:44 2022 +0000 Commit: Sam James gentoo 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 relay.firefox.com> Signed-off-by: Sam James 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 +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?)