Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file
@ 2022-10-04 18:16 dkwo
  2022-10-04 18:35 ` Duncaen
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: dkwo @ 2022-10-04 18:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages wir
https://github.com/void-linux/void-packages/pull/39720

wireplumber: update to 0.4.12, drop dbus check from service file
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64-musl)

According to https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/237 and https://forum.artixlinux.org/index.php/topic,4230.0.html , DBUS is not required, so I dropped it from the service file: everything is working as expected.
(No dbus, no elogind, no membership in audio group: just using seatd and run wireplumber as root using the provided service, my user is member of pipewire group.)

@ericonr @ahesford @Animeshz 

A patch file from https://github.com/void-linux/void-packages/pull/39720.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wir-39720.patch --]
[-- Type: text/x-diff, Size: 4410 bytes --]

From 6625d72b2b102fe227e07d64fdabbab7278d9ffa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 4 Oct 2022 14:01:13 -0400
Subject: [PATCH] wireplumber: update to 0.4.12, drop dbus check from service
 file

---
 srcpkgs/wireplumber/files/wireplumber/run     |  2 -
 ...39b9308cd3d6580bf01077db8cb29ec2aa2f.patch | 54 -------------------
 srcpkgs/wireplumber/template                  |  6 +--
 3 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch

diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
index 9a28ecdbe9a4..4f916d403fb2 100644
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -2,8 +2,6 @@
 # this service is experimental and most setups should start pipewire and wireplumber as a user,
 # for further information, please refer to the handbook
 
-sv check dbus >/dev/null 2>&1 || exit 1
-
 exec 2>&1
 
 export XDG_STATE_HOME=/var/lib/pipewire
diff --git a/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch b/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch
deleted file mode 100644
index 15bd306a78c3..000000000000
--- a/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index c14796c2eb35..823a4cb1e082 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
@ 2022-10-04 18:35 ` Duncaen
  2022-10-04 18:36 ` Duncaen
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2022-10-04 18:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267423533

Comment:
Does everything that depends on dbus still work if dbus is not available on startup? (bluez)?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
  2022-10-04 18:35 ` Duncaen
@ 2022-10-04 18:36 ` Duncaen
  2022-10-04 19:18 ` ahesford
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2022-10-04 18:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267423533

Comment:
Does everything that depends on dbus in wireplumber still work if dbus is not available on startup? (bluez)?

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
  2022-10-04 18:35 ` Duncaen
  2022-10-04 18:36 ` Duncaen
@ 2022-10-04 19:18 ` ahesford
  2022-10-04 19:28 ` [PR PATCH] [Updated] " dkwo
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: ahesford @ 2022-10-04 19:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267472186

Comment:
I think it's fine to drop dbus from a service we generally advise against, but if you're going to drop the check, you should also drop the `dbus-run-session` wrapper around the `wireplumber` execution.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Updated] wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (2 preceding siblings ...)
  2022-10-04 19:18 ` ahesford
@ 2022-10-04 19:28 ` dkwo
  2022-10-04 19:31 ` Duncaen
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2022-10-04 19:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages wir
https://github.com/void-linux/void-packages/pull/39720

wireplumber: update to 0.4.12, drop dbus check from service file
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64-musl)

According to https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/237 and https://forum.artixlinux.org/index.php/topic,4230.0.html , DBUS is not required, so I dropped it from the service file: everything is working as expected.
(No dbus, no elogind, no membership in audio group: just using seatd and run wireplumber as root using the provided service, my user is member of pipewire group.)

@ericonr @ahesford @Animeshz 

A patch file from https://github.com/void-linux/void-packages/pull/39720.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wir-39720.patch --]
[-- Type: text/x-diff, Size: 4580 bytes --]

From 48ed94b7beed1d95da10aad5aee5a8afc4352c0a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 4 Oct 2022 14:01:13 -0400
Subject: [PATCH] wireplumber: update to 0.4.12, drop dbus check from service
 file

---
 srcpkgs/wireplumber/files/wireplumber/run     |  4 +-
 ...39b9308cd3d6580bf01077db8cb29ec2aa2f.patch | 54 -------------------
 srcpkgs/wireplumber/template                  |  6 +--
 3 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch

diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
index 9a28ecdbe9a4..9e0a206466fc 100644
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -2,9 +2,7 @@
 # this service is experimental and most setups should start pipewire and wireplumber as a user,
 # for further information, please refer to the handbook
 
-sv check dbus >/dev/null 2>&1 || exit 1
-
 exec 2>&1
 
 export XDG_STATE_HOME=/var/lib/pipewire
-exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
+exec chpst -u _pipewire:_pipewire:audio:video -P wireplumber
\ No newline at end of file
diff --git a/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch b/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch
deleted file mode 100644
index 15bd306a78c3..000000000000
--- a/srcpkgs/wireplumber/patches/37c839b9308cd3d6580bf01077db8cb29ec2aa2f.patch
+++ /dev/null
@@ -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
-
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index c14796c2eb35..823a4cb1e082 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (3 preceding siblings ...)
  2022-10-04 19:28 ` [PR PATCH] [Updated] " dkwo
@ 2022-10-04 19:31 ` Duncaen
  2022-10-04 19:33 ` Duncaen
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2022-10-04 19:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267484566

Comment:
But its a regression for anyone currently using it, not enabling dbus cripples wireplumber quite a bit. IMHO it would make more sense to let users who don't want to use dbus write their own service if they want to run a system-wide wireplumber.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (4 preceding siblings ...)
  2022-10-04 19:31 ` Duncaen
@ 2022-10-04 19:33 ` Duncaen
  2022-10-04 19:34 ` dkwo
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2022-10-04 19:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267487252

Comment:
But then again, including system wide services as long as they are not fully supported was probably a mistake, just like with pulse.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (5 preceding siblings ...)
  2022-10-04 19:33 ` Duncaen
@ 2022-10-04 19:34 ` dkwo
  2022-10-04 19:55 ` Duncaen
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2022-10-04 19:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267488040

Comment:
@duncaen I see your point. Can you test whether this breaks dbus dependants? I have no such stuff on my machine right now.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (6 preceding siblings ...)
  2022-10-04 19:34 ` dkwo
@ 2022-10-04 19:55 ` Duncaen
  2022-10-11 13:47 ` dkwo
  2022-10-11 13:47 ` [PR PATCH] [Closed]: " dkwo
  9 siblings, 0 replies; 11+ messages in thread
From: Duncaen @ 2022-10-04 19:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1267508538

Comment:
I'm not sure, from just running it manually it seems like modules not being loaded if dbus is not available.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (7 preceding siblings ...)
  2022-10-04 19:55 ` Duncaen
@ 2022-10-11 13:47 ` dkwo
  2022-10-11 13:47 ` [PR PATCH] [Closed]: " dkwo
  9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2022-10-11 13:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/39720#issuecomment-1274713575

Comment:
Let me close this, as it's not clear it's actually a good idea.

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PR PATCH] [Closed]: wireplumber: update to 0.4.12, drop dbus check from service file
  2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
                   ` (8 preceding siblings ...)
  2022-10-11 13:47 ` dkwo
@ 2022-10-11 13:47 ` dkwo
  9 siblings, 0 replies; 11+ messages in thread
From: dkwo @ 2022-10-11 13:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 746 bytes --]

There's a closed pull request on the void-packages repository

wireplumber: update to 0.4.12, drop dbus check from service file
https://github.com/void-linux/void-packages/pull/39720

Description:
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64-musl)

According to https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/237 and https://forum.artixlinux.org/index.php/topic,4230.0.html , DBUS is not required, so I dropped it from the service file: everything is working as expected.
(No dbus, no elogind, no membership in audio group: just using seatd and run wireplumber as root using the provided service, my user is member of pipewire group.)

@ericonr @ahesford @Animeshz 

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-10-11 13:47 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-04 18:16 [PR PATCH] wireplumber: update to 0.4.12, drop dbus check from service file dkwo
2022-10-04 18:35 ` Duncaen
2022-10-04 18:36 ` Duncaen
2022-10-04 19:18 ` ahesford
2022-10-04 19:28 ` [PR PATCH] [Updated] " dkwo
2022-10-04 19:31 ` Duncaen
2022-10-04 19:33 ` Duncaen
2022-10-04 19:34 ` dkwo
2022-10-04 19:55 ` Duncaen
2022-10-11 13:47 ` dkwo
2022-10-11 13:47 ` [PR PATCH] [Closed]: " dkwo

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).