* [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
@ 2023-05-29 19:28 classabbyamp
2023-05-29 19:56 ` [PR PATCH] [Updated] " classabbyamp
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-29 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 765 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pipewire-example-sv
https://github.com/void-linux/void-packages/pull/44141
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-example-sv-44141.patch --]
[-- Type: text/x-diff, Size: 5750 bytes --]
From 3fe8557a779f27029e17375959ccb81c7fadb35b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 1/3] pipewire: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pipewire/files/README.voidlinux | 6 +++---
srcpkgs/pipewire/files/pipewire-pulse/run | 0
srcpkgs/pipewire/files/pipewire/run | 0
srcpkgs/pipewire/template | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire-pulse/run
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84b..56bc937826e4 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,6 @@ 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 services /usr/share/examples/pipewire/sv/pipewire and
+/usr/share/examples/pipewire/sv/pipewire-pulse are experimental and only
+needed in rare cases so using them should be avoided in most setups.
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 92feaab2a6d7..557d06ef6bb4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.71
-revision=1
+revision=2
build_style=meson
configure_args="
--auto-features=enabled
@@ -56,8 +56,9 @@ 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/
+ vcopy ${FILESDIR}/pipewire-pulse usr/share/examples/sv/
vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
}
From bba9f419ae4a03ceec6460e80c7e0ef3cc511b18 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 2/3] wireplumber: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/wireplumber/files/wireplumber/run | 0
srcpkgs/wireplumber/template | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
mode change 100644 => 100755 srcpkgs/wireplumber/files/wireplumber/run
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 80f8f1b7845f..5f36ae28fcc9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.14
-revision=3
+revision=4
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,8 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
post_install() {
vlicense LICENSE
- vsv wireplumber
+ vmkdir usr/share/examples/wireplumber/sv
+ vcopy ${FILESDIR}/wireplumber usr/share/examples/wireplumber/sv/
vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
}
From 49a24083b4d27cef9723ae1c2727df53cf8de00b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 3/3] pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pulseaudio/files/README.voidlinux | 6 +++---
srcpkgs/pulseaudio/files/pulseaudio/run | 0
srcpkgs/pulseaudio/template | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
Optional dependencies:
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..fcd61930f434 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=15.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -53,7 +53,8 @@ pre_configure() {
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
- vsv pulseaudio
+ vmkdir usr/share/examples/pulseaudio/sv/
+ vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
vdoc $FILESDIR/README.voidlinux
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
@ 2023-05-29 19:56 ` classabbyamp
2023-05-29 20:35 ` classabbyamp
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-29 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pipewire-example-sv
https://github.com/void-linux/void-packages/pull/44141
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
originally suggested by @0x5c in IRC
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-example-sv-44141.patch --]
[-- Type: text/x-diff, Size: 6991 bytes --]
From 3fe8557a779f27029e17375959ccb81c7fadb35b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 1/4] pipewire: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pipewire/files/README.voidlinux | 6 +++---
srcpkgs/pipewire/files/pipewire-pulse/run | 0
srcpkgs/pipewire/files/pipewire/run | 0
srcpkgs/pipewire/template | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire-pulse/run
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84b..56bc937826e4 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,6 @@ 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 services /usr/share/examples/pipewire/sv/pipewire and
+/usr/share/examples/pipewire/sv/pipewire-pulse are experimental and only
+needed in rare cases so using them should be avoided in most setups.
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 92feaab2a6d7..557d06ef6bb4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.71
-revision=1
+revision=2
build_style=meson
configure_args="
--auto-features=enabled
@@ -56,8 +56,9 @@ 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/
+ vcopy ${FILESDIR}/pipewire-pulse usr/share/examples/sv/
vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
}
From bba9f419ae4a03ceec6460e80c7e0ef3cc511b18 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 2/4] wireplumber: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/wireplumber/files/wireplumber/run | 0
srcpkgs/wireplumber/template | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
mode change 100644 => 100755 srcpkgs/wireplumber/files/wireplumber/run
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 80f8f1b7845f..5f36ae28fcc9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.14
-revision=3
+revision=4
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,8 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
post_install() {
vlicense LICENSE
- vsv wireplumber
+ vmkdir usr/share/examples/wireplumber/sv
+ vcopy ${FILESDIR}/wireplumber usr/share/examples/wireplumber/sv/
vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
}
From 49a24083b4d27cef9723ae1c2727df53cf8de00b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 3/4] pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pulseaudio/files/README.voidlinux | 6 +++---
srcpkgs/pulseaudio/files/pulseaudio/run | 0
srcpkgs/pulseaudio/template | 5 +++--
3 files changed, 6 insertions(+), 5 deletions(-)
mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
Optional dependencies:
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..fcd61930f434 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=15.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -53,7 +53,8 @@ pre_configure() {
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
- vsv pulseaudio
+ vmkdir usr/share/examples/pulseaudio/sv/
+ vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
vdoc $FILESDIR/README.voidlinux
}
From 4038d4355908c43e9322d29fab5e4699b859e28c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:55:54 -0400
Subject: [PATCH 4/4] fixup! pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pulseaudio/template | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index fcd61930f434..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
python_version=3
# FIXME: core-util-test fails
-make_check=yes
+make_check=no
system_groups="pulse-access"
system_accounts="pulse"
@@ -44,13 +44,6 @@ case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
esac
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- # Disable neon optimizations for the arm* architectures
- arm*) vsed -e '/ neon/d' -i src/pulsecore/meson.build ;;
- esac
-}
-
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
vmkdir usr/share/examples/pulseaudio/sv/
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
2023-05-29 19:56 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-05-29 20:35 ` classabbyamp
2023-05-29 21:21 ` ahesford
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-29 20:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pipewire-example-sv
https://github.com/void-linux/void-packages/pull/44141
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
originally suggested by @0x5c in IRC
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-example-sv-44141.patch --]
[-- Type: text/x-diff, Size: 6361 bytes --]
From 3fe8557a779f27029e17375959ccb81c7fadb35b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 1/3] pipewire: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/pipewire/files/README.voidlinux | 6 +++---
srcpkgs/pipewire/files/pipewire-pulse/run | 0
srcpkgs/pipewire/files/pipewire/run | 0
srcpkgs/pipewire/template | 7 ++++---
4 files changed, 7 insertions(+), 6 deletions(-)
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire-pulse/run
mode change 100644 => 100755 srcpkgs/pipewire/files/pipewire/run
diff --git a/srcpkgs/pipewire/files/README.voidlinux b/srcpkgs/pipewire/files/README.voidlinux
index 33892fdef84b..56bc937826e4 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,6 @@ 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 services /usr/share/examples/pipewire/sv/pipewire and
+/usr/share/examples/pipewire/sv/pipewire-pulse are experimental and only
+needed in rare cases so using them should be avoided in most setups.
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/files/pipewire/run b/srcpkgs/pipewire/files/pipewire/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 92feaab2a6d7..557d06ef6bb4 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
# Template file for 'pipewire'
pkgname=pipewire
version=0.3.71
-revision=1
+revision=2
build_style=meson
configure_args="
--auto-features=enabled
@@ -56,8 +56,9 @@ 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/
+ vcopy ${FILESDIR}/pipewire-pulse usr/share/examples/sv/
vinstall "${FILESDIR}/pipewire.desktop" 644 usr/share/applications
vinstall "${FILESDIR}/pipewire-pulse.desktop" 644 usr/share/applications
}
From bba9f419ae4a03ceec6460e80c7e0ef3cc511b18 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 2/3] wireplumber: move system services to
/usr/share/examples/PKGNAME/sv/
---
srcpkgs/wireplumber/files/wireplumber/run | 0
srcpkgs/wireplumber/template | 5 +++--
2 files changed, 3 insertions(+), 2 deletions(-)
mode change 100644 => 100755 srcpkgs/wireplumber/files/wireplumber/run
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 80f8f1b7845f..5f36ae28fcc9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.14
-revision=3
+revision=4
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,8 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
post_install() {
vlicense LICENSE
- vsv wireplumber
+ vmkdir usr/share/examples/wireplumber/sv
+ vcopy ${FILESDIR}/wireplumber usr/share/examples/wireplumber/sv/
vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
}
From 27a3ab04e76b9be10d41c8cef234ce577640334b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 3/3] pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
also fix a couple things in the template
---
srcpkgs/pulseaudio/files/README.voidlinux | 6 +++---
srcpkgs/pulseaudio/files/pulseaudio/run | 0
srcpkgs/pulseaudio/template | 14 ++++----------
3 files changed, 7 insertions(+), 13 deletions(-)
mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
Optional dependencies:
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=15.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
python_version=3
# FIXME: core-util-test fails
-make_check=yes
+make_check=no
system_groups="pulse-access"
system_accounts="pulse"
@@ -44,16 +44,10 @@ case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
esac
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- # Disable neon optimizations for the arm* architectures
- arm*) vsed -e '/ neon/d' -i src/pulsecore/meson.build ;;
- esac
-}
-
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
- vsv pulseaudio
+ vmkdir usr/share/examples/pulseaudio/sv/
+ vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
vdoc $FILESDIR/README.voidlinux
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
2023-05-29 19:56 ` [PR PATCH] [Updated] " classabbyamp
2023-05-29 20:35 ` classabbyamp
@ 2023-05-29 21:21 ` ahesford
2023-05-29 21:57 ` [PR PATCH] [Updated] " classabbyamp
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2023-05-29 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 779 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/44141#issuecomment-1567526996
Comment:
This is fine, but I think it might be better to completely remove the pipewire-pulse and wireplumber services, modify the (now example) pipewire service to wrap it in `dbus-run-session`, and tell people that want to use it that they should make pipewire launch pipewire-pulse and wireplumber via the proposed example config snippets.
This probably requires `control/t` and the pgrphack (`chpst -P`) trick in the current wireplumber service to make a best effort to kill all children.
This is essentially how I run a pipewire system service, and it is much more reliable and straightforward than trying to manage multiple services.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (2 preceding siblings ...)
2023-05-29 21:21 ` ahesford
@ 2023-05-29 21:57 ` classabbyamp
2023-05-29 21:58 ` classabbyamp
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-29 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pipewire-example-sv
https://github.com/void-linux/void-packages/pull/44141
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
originally suggested by @0x5c in IRC
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-example-sv-44141.patch --]
[-- Type: text/x-diff, Size: 8563 bytes --]
From c7010f7c8f493895537dffdab42299df02b6bdaa Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 1/3] 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 | 7 ++++---
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, 10 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 33892fdef84b..552fd218bb32 100644
--- a/srcpkgs/pipewire/files/README.voidlinux
+++ b/srcpkgs/pipewire/files/README.voidlinux
@@ -8,6 +8,7 @@ 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 written in the documentation.
diff --git a/srcpkgs/pipewire/files/pipewire-pulse/run b/srcpkgs/pipewire/files/pipewire-pulse/run
deleted file mode 100644
index 6eb172b8b19f..000000000000
--- 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 000000000000..a095b7bc777a
--- /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 a201626e464d..d932511a9700
--- 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 7ad92c87fa3b..3e0cffb69a3c 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"
From cb14f74dbcadf375e994c86a256ca91b3dc3a9c9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 2/3] wireplumber: remove system service
if desired, can be launched by pipewire config
---
srcpkgs/wireplumber/files/wireplumber/control/t | 2 --
srcpkgs/wireplumber/files/wireplumber/run | 10 ----------
srcpkgs/wireplumber/template | 3 +--
3 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
delete mode 100644 srcpkgs/wireplumber/files/wireplumber/run
diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
deleted file mode 100755
index a095b7bc777a..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
deleted file mode 100644
index 9a28ecdbe9a4..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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 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
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 3584bf374a64..0014c3357f7c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.14
-revision=4
+revision=5
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,6 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
post_install() {
vlicense LICENSE
- vsv wireplumber
vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
vsconf "${FILESDIR}/10-wireplumber.conf"
}
From a5d47b047b583df21233ab5382158447e4646f1a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 3/3] pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
also fix a couple things in the template
---
srcpkgs/pulseaudio/files/README.voidlinux | 6 +++---
srcpkgs/pulseaudio/files/pulseaudio/run | 0
srcpkgs/pulseaudio/template | 14 ++++----------
3 files changed, 7 insertions(+), 13 deletions(-)
mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
Optional dependencies:
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=15.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
python_version=3
# FIXME: core-util-test fails
-make_check=yes
+make_check=no
system_groups="pulse-access"
system_accounts="pulse"
@@ -44,16 +44,10 @@ case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
esac
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- # Disable neon optimizations for the arm* architectures
- arm*) vsed -e '/ neon/d' -i src/pulsecore/meson.build ;;
- esac
-}
-
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
- vsv pulseaudio
+ vmkdir usr/share/examples/pulseaudio/sv/
+ vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
vdoc $FILESDIR/README.voidlinux
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (3 preceding siblings ...)
2023-05-29 21:57 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-05-29 21:58 ` classabbyamp
2023-05-30 2:03 ` [PR REVIEW] " ahesford
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-29 21:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/44141#issuecomment-1567545116
Comment:
how's this look? I haven't tested it because I don't run pw that way.
Does `/run/pulse` still need creation if missing?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (5 preceding siblings ...)
2023-05-30 2:03 ` [PR REVIEW] " ahesford
@ 2023-05-30 2:03 ` ahesford
2023-05-30 2:14 ` [PR PATCH] [Updated] " classabbyamp
2023-05-30 2:46 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2023-05-30 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/44141#discussion_r1209637886
Comment:
```suggestion
pipewire-pulse and wireplumber as documented at
https://docs.voidlinux.org/config/media/pipewire.html
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (4 preceding siblings ...)
2023-05-29 21:58 ` classabbyamp
@ 2023-05-30 2:03 ` ahesford
2023-05-30 2:03 ` ahesford
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ahesford @ 2023-05-30 2:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/44141#discussion_r1209637768
Comment:
```suggestion
experimental and only needed in rare cases, so using it should be avoided
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (6 preceding siblings ...)
2023-05-30 2:03 ` ahesford
@ 2023-05-30 2:14 ` classabbyamp
2023-05-30 2:46 ` [PR PATCH] [Merged]: " classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-30 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pipewire-example-sv
https://github.com/void-linux/void-packages/pull/44141
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
originally suggested by @0x5c in IRC
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/44141.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pipewire-example-sv-44141.patch --]
[-- Type: text/x-diff, Size: 8611 bytes --]
From 75f228f64113087b5dbb473c852e9b630ac49834 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:46 -0400
Subject: [PATCH 1/3] 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 33892fdef84b..f2c10e37e7cd 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 6eb172b8b19f..000000000000
--- 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 000000000000..a095b7bc777a
--- /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 a201626e464d..d932511a9700
--- 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 7ad92c87fa3b..3e0cffb69a3c 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"
From e6eaddf7bd38f29b4809b436131ef45a9dd52d96 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:24:59 -0400
Subject: [PATCH 2/3] wireplumber: remove system service
if desired, can be launched by pipewire config
---
srcpkgs/wireplumber/files/wireplumber/control/t | 2 --
srcpkgs/wireplumber/files/wireplumber/run | 10 ----------
srcpkgs/wireplumber/template | 3 +--
3 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
delete mode 100644 srcpkgs/wireplumber/files/wireplumber/run
diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
deleted file mode 100755
index a095b7bc777a..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/control/t
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
deleted file mode 100644
index 9a28ecdbe9a4..000000000000
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/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 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
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 3584bf374a64..0014c3357f7c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
# Template file for 'wireplumber'
pkgname=wireplumber
version=0.4.14
-revision=4
+revision=5
build_style=meson
build_helper=gir
configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -20,7 +20,6 @@ make_dirs="/var/lib/wireplumber 0755 _pipewire _pipewire"
post_install() {
vlicense LICENSE
- vsv wireplumber
vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications
vsconf "${FILESDIR}/10-wireplumber.conf"
}
From 12a5f0267be18827e99465366195a6fcaa47f1f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 29 May 2023 15:25:05 -0400
Subject: [PATCH 3/3] pulseaudio: move system services to
/usr/share/examples/PKGNAME/sv/
also fix a couple things in the template
---
srcpkgs/pulseaudio/files/README.voidlinux | 6 +++---
srcpkgs/pulseaudio/files/pulseaudio/run | 0
srcpkgs/pulseaudio/template | 14 ++++----------
3 files changed, 7 insertions(+), 13 deletions(-)
mode change 100644 => 100755 srcpkgs/pulseaudio/files/pulseaudio/run
diff --git a/srcpkgs/pulseaudio/files/README.voidlinux b/srcpkgs/pulseaudio/files/README.voidlinux
index 68bcd10179c3..56fda2525861 100644
--- a/srcpkgs/pulseaudio/files/README.voidlinux
+++ b/srcpkgs/pulseaudio/files/README.voidlinux
@@ -1,6 +1,6 @@
-The system service `/etc/sv/pulseaudio` provided by the pulseaudio package is
-only needed in rare cases and should be avoided in most setups for performance
-and security reasons.
+The example system service `/usr/share/examples/pulseaudio/sv/pulseaudio`
+provided by the pulseaudio package is only needed in rare cases and should be
+avoided in most setups for performance and security reasons.
Optional dependencies:
diff --git a/srcpkgs/pulseaudio/files/pulseaudio/run b/srcpkgs/pulseaudio/files/pulseaudio/run
old mode 100644
new mode 100755
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index 685154e8c0e1..1bbca888f444 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=15.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -26,7 +26,7 @@ distfiles="${FREEDESKTOP_SITE}/${pkgname}/releases/${pkgname}-${version}.tar.xz"
checksum=a40b887a3ba98cc26976eb11bdb6613988f145b19024d1b6555c6a03c9cba1a0
python_version=3
# FIXME: core-util-test fails
-make_check=yes
+make_check=no
system_groups="pulse-access"
system_accounts="pulse"
@@ -44,16 +44,10 @@ case "$XBPS_TARGET_MACHINE" in
arm*) configure_args+=" -Db_lto=false"
esac
-pre_configure() {
- case "$XBPS_TARGET_MACHINE" in
- # Disable neon optimizations for the arm* architectures
- arm*) vsed -e '/ neon/d' -i src/pulsecore/meson.build ;;
- esac
-}
-
post_install() {
rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf
- vsv pulseaudio
+ vmkdir usr/share/examples/pulseaudio/sv/
+ vcopy ${FILESDIR}/pulseaudio usr/share/examples/pulseaudio/sv/
vdoc $FILESDIR/README.voidlinux
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
` (7 preceding siblings ...)
2023-05-30 2:14 ` [PR PATCH] [Updated] " classabbyamp
@ 2023-05-30 2:46 ` classabbyamp
8 siblings, 0 replies; 10+ messages in thread
From: classabbyamp @ 2023-05-30 2:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
There's a merged pull request on the void-packages repository
[RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/
https://github.com/void-linux/void-packages/pull/44141
Description:
To reduce confusion and counteract users who enable every service they see willy-nilly, hide the system services for pipewire, pipewire-pulse, wireplumber, and pulseaudio in `/usr/share/examples/$pkgname/sv/`.
originally suggested by @0x5c in IRC
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-05-30 2:46 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-29 19:28 [PR PATCH] [RFC] pipewire, wireplumber, pulseaudio: move system services to /usr/share/examples/PKGNAME/sv/ classabbyamp
2023-05-29 19:56 ` [PR PATCH] [Updated] " classabbyamp
2023-05-29 20:35 ` classabbyamp
2023-05-29 21:21 ` ahesford
2023-05-29 21:57 ` [PR PATCH] [Updated] " classabbyamp
2023-05-29 21:58 ` classabbyamp
2023-05-30 2:03 ` [PR REVIEW] " ahesford
2023-05-30 2:03 ` ahesford
2023-05-30 2:14 ` [PR PATCH] [Updated] " classabbyamp
2023-05-30 2:46 ` [PR PATCH] [Merged]: " classabbyamp
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).