From 7882d2f8a5c93e33b904f9c4603c179b41fdfe91 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Tue, 29 Mar 2022 23:59:51 +0530 Subject: [PATCH 1/2] wireplumber: Add runit service --- srcpkgs/wireplumber/files/wireplumber/control/t | 3 +++ srcpkgs/wireplumber/files/wireplumber/run | 5 +++++ srcpkgs/wireplumber/template | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t create mode 100644 srcpkgs/wireplumber/files/wireplumber/run diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t new file mode 100755 index 000000000000..29317922c4bb --- /dev/null +++ b/srcpkgs/wireplumber/files/wireplumber/control/t @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/bin/kill -TERM $(pgrep -P $(cat /run/runit/supervise.wireplumber/pid) | tail -1) diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run new file mode 100644 index 000000000000..2049d18b4d2b --- /dev/null +++ b/srcpkgs/wireplumber/files/wireplumber/run @@ -0,0 +1,5 @@ +#!/bin/sh +# 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 pipewire > /dev/null || exit 1 +exec env HOME=/var/run/pipewire chpst -u _pipewire:_pipewire:audio:video dbus-run-session wireplumber diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index e94c35b3eea5..dadbf62647fb 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,7 +1,7 @@ # Template file for 'wireplumber' pkgname=wireplumber version=0.4.8 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dintrospection=enabled -Dsystem-lua=true" @@ -18,6 +18,7 @@ checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605 post_install() { vlicense LICENSE + vsv wireplumber } wireplumber-devel_package() { From 34ee19cf6d43209394543b29783a10d22d3f8028 Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Wed, 30 Mar 2022 18:39:09 +0530 Subject: [PATCH 2/2] wireplumber: apply pr suggestions --- srcpkgs/wireplumber/files/wireplumber/control/t | 3 +-- srcpkgs/wireplumber/files/wireplumber/run | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t index 29317922c4bb..a095b7bc777a 100755 --- a/srcpkgs/wireplumber/files/wireplumber/control/t +++ b/srcpkgs/wireplumber/files/wireplumber/control/t @@ -1,3 +1,2 @@ #!/bin/sh - -/usr/bin/kill -TERM $(pgrep -P $(cat /run/runit/supervise.wireplumber/pid) | tail -1) +[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid) diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run index 2049d18b4d2b..649882664c30 100644 --- a/srcpkgs/wireplumber/files/wireplumber/run +++ b/srcpkgs/wireplumber/files/wireplumber/run @@ -1,5 +1,5 @@ #!/bin/sh # 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 pipewire > /dev/null || exit 1 -exec env HOME=/var/run/pipewire chpst -u _pipewire:_pipewire:audio:video dbus-run-session wireplumber +export HOME=/var/run/pipewire +exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber