From abc072b678cb5aaae391a913d43d838cc6694696 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH] pipewire: move system service to
 /usr/share/examples/PKGNAME/sv/

remove pipewire-pulse service. this should be launched by pipewire
config if desired
---
 srcpkgs/pipewire/files/README.voidlinux   | 9 ++++++---
 srcpkgs/pipewire/files/pipewire-pulse/run | 8 --------
 srcpkgs/pipewire/files/pipewire/control/t | 2 ++
 srcpkgs/pipewire/files/pipewire/run       | 2 +-
 srcpkgs/pipewire/template                 | 6 +++---
 5 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 srcpkgs/pipewire/files/pipewire-pulse/run
 create mode 100755 srcpkgs/pipewire/files/pipewire/control/t
 mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run

diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84..f2c10e37e7c 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,9 @@ Optional dependencies:
 * `libspa-v4l2` for video camera support
 * `rtkit` for realtime priority acquisition
 
-The system services /etc/sv/pipewire and /etc/sv/pipewire-pulse are
-experimental and only needed in rare cases so using them should be
-avoided in most setups.
+The example system service /usr/share/examples/pipewire/sv/pipewire is
+experimental and only needed in rare cases, so using it should be avoided
+in most setups. To use it, pipewire needs to be configured to launch
+pipewire-pulse and wireplumber as documented at
+
+    https://docs.voidlinux.org/config/media/pipewire.html
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
deleted file mode 100644
index 6eb172b8b19..00000000000
--- a/srcpkgs/pipewire/files/pipewire-pulse/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-# this service is experimental and most setups should start pipewire as a user,
-# for further information, please refer to the handbook
-! [ -d /run/pulse ] && install -m 755 -g _pipewire -o _pipewire -d /run/pulse
-umask 002
-export PULSE_RUNTIME_PATH=/run/pulse
-exec chpst -u _pipewire:_pipewire pipewire-pulse
diff --git a/srcpkgs/pipewire/files/pipewire/control/t b/srcpkgs/pipewire/files/pipewire/control/t
new file mode 100755
index 00000000000..a095b7bc777
--- /dev/null
+++ b/srcpkgs/pipewire/files/pipewire/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
index a201626e464..d932511a970
--- a/srcpkgs/pipewire/files/pipewire/run
+++ b/srcpkgs/pipewire/files/pipewire/run
@@ -6,4 +6,4 @@ exec 2>&1
 umask 002
 export PIPEWIRE_RUNTIME_DIR=/run/pipewire
 export XDG_STATE_HOME=/var/lib
-exec chpst -u _pipewire:_pipewire:audio:video pipewire
+exec chpst -P -u _pipewire:_pipewire:audio:video dbus-run-session pipewire
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 7ad92c87fa3..3e0cffb69a3 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.71
-revision=2
+revision=3
 build_style=meson
 configure_args="
  --auto-features=enabled
@@ -56,8 +56,8 @@ fi
 post_install() {
 	vlicense LICENSE
 	vdoc "${FILESDIR}/README.voidlinux"
-	vsv pipewire
-	vsv pipewire-pulse
+	vmkdir usr/share/examples/sv
+	vcopy ${FILESDIR}/pipewire usr/share/examples/sv/
 	vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
 	vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
 	vsconf "${FILESDIR}/20-pipewire-pulse.conf"