Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] create pipewire-session-manager alternative group
@ 2023-10-29 19:11 classabbyamp
  2023-10-29 20:07 ` ahesford
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: classabbyamp @ 2023-10-29 19:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages session-manager-alts
https://github.com/void-linux/void-packages/pull/46960

[RFC] create pipewire-session-manager alternative group
also moves pipewire/wireplumber configs to `/usr/share/pipewire/pipewire.conf.avail`, which seems like the upstream-compatible place.

#### Pros
- this will make any future session managers easier to add and switch between
- this removes one step in configuring pipewire (no more symlinking wireplumber conf)

#### Cons
- no way to disable this, short of `noextract=/usr/share/pipewire/pipewire.conf.avail/10-wireplumber.conf`
- causes 2 wireplumbers to run, which does not seem to cause issues aside from having 1 that spews errors forever (is this worth an INSTALL.msg?)

#### Testing the changes
- I tested the changes in this PR: **YES**

**needs associated documentation adjustment**

cc: @cinerea0 @ahesford @paper42 

A patch file from https://github.com/void-linux/void-packages/pull/46960.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-session-manager-alts-46960.patch --]
[-- Type: text/x-diff, Size: 3437 bytes --]

From 46a04b0a64f90bf7cd8ee2f8874f898d97794f11 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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 f21d9321f60c9..459dfb73c9d84 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.82
-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 ef8d77820064a009a81c9d7dbab085bf5209ed52 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
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() {

^ permalink raw reply	[flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-02-17  1:44 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-29 19:11 [PR PATCH] [RFC] create pipewire-session-manager alternative group classabbyamp
2023-10-29 20:07 ` ahesford
2023-10-29 20:08 ` classabbyamp
2023-10-29 20:09 ` [PR PATCH] [Updated] " classabbyamp
2023-10-29 20:35 ` ahesford
2023-10-30 20:02 ` oreo639
2023-10-30 20:03 ` oreo639
2023-10-30 20:05 ` oreo639
2023-10-30 20:06 ` oreo639
2023-10-30 20:28 ` oreo639
2023-10-30 20:30 ` oreo639
2023-10-31  2:26 ` cinerea0
2023-10-31  2:46 ` oreo639
2023-10-31  2:46 ` oreo639
2023-11-18 20:57 ` cinerea0
2024-02-17  1:44 ` github-actions

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).