From 94f989a4fa122aff1f255f8353fb6995bc4ccc46 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 29 Oct 2023 14:58:45 -0400 Subject: [PATCH 1/2] pipewire: move 20-pipewire-pulse.conf to pipewire.conf.avail this is a more proper place for it. still includes a symlink to /usr/share/examples/... so users don't get bitten by this change --- srcpkgs/pipewire/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index d6736fe4925bb..c4fe2f326adba 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire version=0.3.83 -revision=1 +revision=2 build_style=meson configure_args=" --auto-features=enabled @@ -60,7 +60,11 @@ post_install() { 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" + vinstall "${FILESDIR}/20-pipewire-pulse.conf" 644 usr/share/pipewire/pipewire.conf.avail + # preserve compatibility with previously-shipped path for users who symlinked to it + vmkdir usr/share/examples/pipewire + ln -s /usr/share/pipewire/pipewire.conf.avail/20-pipewire-pulse.conf \ + "${DESTDIR}"/usr/share/examples/pipewire/20-pipewire-pulse.conf } libpipewire_package() { From cc4cc7f0c7e70048148b07d4119f084029c8d1e9 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 29 Oct 2023 15:00:08 -0400 Subject: [PATCH 2/2] wireplumber: provide 10-session-manager.conf alternative also move wireplumber config to pipewire.conf.avail, as it seems to be the proper place. /usr/share/examples/... remains as a symlink for backcompat --- srcpkgs/wireplumber/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template index fe8e739dbe47b..9407a5dd1ec13 100644 --- a/srcpkgs/wireplumber/template +++ b/srcpkgs/wireplumber/template @@ -1,7 +1,7 @@ # Template file for 'wireplumber' pkgname=wireplumber version=0.4.15 -revision=1 +revision=2 build_style=meson build_helper=gir configure_args="-Dintrospection=enabled -Dsystem-lua=true" @@ -15,12 +15,17 @@ 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=389f5ebce1193419900f5dbc6647df8e3176731a0514ab33ae2afab1cdd8a415 +alternatives="pipewire-session-manager:/usr/share/pipewire/pipewire.conf.d/10-session-manager.conf:/usr/share/pipewire/pipewire.conf.avail/10-wireplumber.conf" provides="pipewire-session-manager-0_1" post_install() { vlicense LICENSE vinstall "${FILESDIR}/wireplumber.desktop" 644 usr/share/applications - vsconf "${FILESDIR}/10-wireplumber.conf" + vinstall "${FILESDIR}/10-wireplumber.conf" 644 usr/share/pipewire/pipewire.conf.avail + # preserve compatibility with previously-shipped path for users who symlinked to it + vmkdir usr/share/examples/wireplumber + ln -s /usr/share/pipewire/pipewire.conf.avail/10-wireplumber.conf \ + "${DESTDIR}"/usr/share/examples/wireplumber/10-wireplumber.conf } wireplumber-devel_package() {