diff --git a/0001-alsa-dont-set--1-as-node.target.patch b/0001-alsa-dont-set--1-as-node.target.patch new file mode 100644 index 0000000..739fee9 --- /dev/null +++ b/0001-alsa-dont-set--1-as-node.target.patch @@ -0,0 +1,29 @@ +From 89ac6b353521fb9a6d6eb6bb74724c4fa968f75c Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Sat, 17 Dec 2022 18:17:33 +0100 +Subject: [PATCH] =?UTF-8?q?alsa:=20don=C2=B4t=20set=20-1=20as=20node.targe?= + =?UTF-8?q?t?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Leave the target unset when -1, just like what pw-stream does. + +See #2893 +--- + pipewire-alsa/alsa-plugins/pcm_pipewire.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pipewire-alsa/alsa-plugins/pcm_pipewire.c b/pipewire-alsa/alsa-plugins/pcm_pipewire.c +index 37a907b24..96b57da78 100644 +--- a/pipewire-alsa/alsa-plugins/pcm_pipewire.c ++++ b/pipewire-alsa/alsa-plugins/pcm_pipewire.c +@@ -579,7 +579,7 @@ static int snd_pcm_pipewire_prepare(snd_pcm_ioplug_t *io) + pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%lu/%u", pw->min_avail, io->rate); + if (pw_properties_get(props, PW_KEY_NODE_RATE) == NULL) + pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", io->rate); +- if (pw->target != NULL && ++ if (pw->target != NULL && !spa_streq(pw->target, "-1") && + pw_properties_get(props, PW_KEY_NODE_TARGET) == NULL) + pw_properties_setf(props, PW_KEY_NODE_TARGET, "%s", pw->target); + diff --git a/pipewire.changes b/pipewire.changes index 8696f43..31896e0 100644 --- a/pipewire.changes +++ b/pipewire.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 19 11:00:49 UTC 2022 - Antonio Larrosa + +- Add patch from upstream to remember last routing after a reboot + (glfo#pipewire/pipewire#2893): + * 0001-alsa-dont-set--1-as-node.target.patch + ------------------------------------------------------------------- Thu Dec 15 17:37:52 UTC 2022 - Alexei Sorokin diff --git a/pipewire.spec b/pipewire.spec index e5e215f..849ec34 100644 --- a/pipewire.spec +++ b/pipewire.spec @@ -66,6 +66,8 @@ Source99: baselibs.conf Patch0: reduce-meson-dependency.patch # PATCH-FIX-UPSTREAM 0001-pulse-server-add-channel-map-in-echo-cancel-module.patch Patch1: 0001-pulse-server-add-channel-map-in-echo-cancel-module.patch +# PATCH-FIX-UPSTREAM 0001-alsa-dont-set--1-as-node.target.patch +Patch2: 0001-alsa-dont-set--1-as-node.target.patch BuildRequires: docutils BuildRequires: doxygen BuildRequires: fdupes @@ -338,6 +340,7 @@ This package provides a PulseAudio implementation based on PipeWire %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 %build %if %{pkg_vcmp gcc < 8}