From 3fe8557a779f27029e17375959ccb81c7fadb35b Mon Sep 17 00:00:00 2001 From: classabbyamp 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 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 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 }