wireplumber: update to 0.4.12

I've removed the patch that fixes the rescan issue, as it is already
applied in this release.
This commit is contained in:
Rodrigo Oliveira 2022-10-25 01:09:30 -03:00 committed by Duncan Overbruck
parent 02fb37373b
commit 2097c09d52
2 changed files with 3 additions and 57 deletions

View file

@ -1,54 +0,0 @@
From 37c839b9308cd3d6580bf01077db8cb29ec2aa2f Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pav@iki.fi>
Date: Tue, 19 Jul 2022 20:39:06 +0300
Subject: [PATCH] policy-node: fix potential rescan loop
SiLink activation might be delayed indefinitely under some error
conditions. Currently, policy-node schedules a rescan when it sees a
non-activated link on a stream to be moved, which produces busy loop if
the si-link doesn't activate.
Instead of rescheduling on non-active si-links, just remove and emit a
warning. The si-link then gets removed once it gets activated.
Reproducer:
1. Play audio from Rhythmbox and pause.
2. Switch default output with pactl between two different outputs
3. Links from the paused stream stay at "init"
---
src/scripts/policy-node.lua | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/scripts/policy-node.lua b/src/scripts/policy-node.lua
index e6816723..43df701c 100644
--- a/src/scripts/policy-node.lua
+++ b/src/scripts/policy-node.lua
@@ -694,16 +694,15 @@ function handleLinkable (si)
local link = lookupLink (si_id, si_flags[si_id].peer_id)
if reconnect then
if link ~= nil then
- -- remove old link if active, otherwise schedule rescan
- if ((link:get_active_features() & Feature.SessionItem.ACTIVE) ~= 0) then
- si_flags[si_id].peer_id = nil
- link:remove ()
- Log.info (si, "... moving to new target")
- else
- scheduleRescan()
- Log.info (si, "... scheduled rescan")
- return
+ -- remove old link
+ if ((link:get_active_features() & Feature.SessionItem.ACTIVE) == 0) then
+ -- remove also not yet activated links: they might never become active,
+ -- and we should not loop waiting for them
+ Log.warning (link, "Link was not activated before removing")
end
+ si_flags[si_id].peer_id = nil
+ link:remove ()
+ Log.info (si, "... moving to new target")
end
else
if link ~= nil then
--
GitLab

View file

@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.11
revision=2
version=0.4.12
revision=1
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@ -14,7 +14,7 @@ license="MIT"
homepage="https://pipewire.pages.freedesktop.org/wireplumber"
changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
checksum=cf5df4e4d2ab5402b4ede3bfa8931ff758359a46b6676541faebf3055d5a1fc6
checksum=afece031dd2d1a5f535de29e21ea94a1b261d3da62b5dbb977e19668f4453b27
post_install() {
vlicense LICENSE