Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] pipewire: use a conffile to autostart p-m-s
@ 2022-08-07 19:28 CameronNemo
  2022-08-17 19:20 ` [PR PATCH] [Updated] " CameronNemo
                   ` (72 more replies)
  0 siblings, 73 replies; 74+ messages in thread
From: CameronNemo @ 2022-08-07 19:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/CameronNemo/void-packages pipewire-session
https://github.com/void-linux/void-packages/pull/38521

pipewire: use a conffile to autostart p-m-s
It should be possible to disable autostart of pipewire-media-session and
use some other method to start it, or start wireplumber instead.

Rather than patch /usr/share/pipewire/pipewire.conf, ship a drop-in
config in /etc/pipewire/pipewire.conf.d and mark it as a conffile.

<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 1d045c18facda3bd5db359b6258dce66d261b2c9 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 7 Aug 2022 12:26:05 -0700
Subject: [PATCH] pipewire: use a conffile to autostart p-m-s

It should be possible to disable autostart of pipewire-media-session and
use some other method to start it, or start wireplumber instead.

Rather than patch /usr/share/pipewire/pipewire.conf, ship a drop-in
config in /etc/pipewire/pipewire.conf.d and mark it as a conffile.
---
 .../files/10-autostart-session-manager.conf     |  6 ++++++
 .../patches/autostart-media-session.patch       | 17 -----------------
 srcpkgs/pipewire/template                       |  4 +++-
 3 files changed, 9 insertions(+), 18 deletions(-)
 create mode 100644 srcpkgs/pipewire/files/10-autostart-session-manager.conf
 delete mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch

diff --git a/srcpkgs/pipewire/files/10-autostart-session-manager.conf b/srcpkgs/pipewire/files/10-autostart-session-manager.conf
new file mode 100644
index 000000000000..d4cb814bc6e7
--- /dev/null
+++ b/srcpkgs/pipewire/files/10-autostart-session-manager.conf
@@ -0,0 +1,6 @@
+# The session manager is an essential component. It's not easy to start it
+# externally in a script since it needs the pipewire socket up, and Void
+# doesn't have a mechanism to ensure it (systemd socket activation).
+context.exec = [
+    { path = "/usr/bin/pipewire-media-session" args = "" }
+]
diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch
deleted file mode 100644
index c5753a3719c2..000000000000
--- a/srcpkgs/pipewire/patches/autostart-media-session.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream's config does not autostart pipewire-media-session anymore, which
-is an essential component. It's not easy to start it externally in a script
-since it needs the pipewire socket up, and Void doesn't have a mechanism to
-ensure it (systemd socket activation).
-diff --git a/src/daemon/pipewire.conf.in.orig b/src/daemon/pipewire.conf.in
-index 95632c2..ab0b097 100644
---- a/src/daemon/pipewire.conf.in.orig
-+++ b/src/daemon/pipewire.conf.in
-@@ -236,7 +236,7 @@
-     # but it is better to start it as a systemd service.
-     # Run the session manager with -h for options.
-     #
--    @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" }
-+    { path = "@session_manager_path@" args = "@session_manager_args@" }
-     #
-     # You can optionally start the pulseaudio-server here as well
-     # but it is better to start it as a systemd service.
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 220bf2f68b6b..5835fee4d2b6 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,7 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.56
-revision=1
+revision=2
 _pms_version=0.4.1
 build_style=meson
 configure_args="
@@ -37,6 +37,7 @@ distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}
 checksum="e73d8897daac8f9e61a23193ed71971682715a5997cb553d809bc61a349ef03c
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
+conf_files="/etc/pipewire/pipewire.conf.d/*"
 system_accounts="_pipewire"
 
 build_options="sdl2"
@@ -63,6 +64,7 @@ post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vsv pipewire
 	vsv pipewire-pulse
+	vinstall "${FILESDIR}/10-autostart-session-manager.conf" 644 etc/pipewire/pipewire.conf.d
 	vmkdir usr/share/applications
 	cp "${FILESDIR}/pipewire.desktop" ${DESTDIR}/usr/share/applications/pipewire.desktop
 	cp "${FILESDIR}/pipewire-pulse.desktop" ${DESTDIR}/usr/share/applications/pipewire-pulse.desktop

^ permalink raw reply	[flat|nested] 74+ messages in thread

end of thread, other threads:[~2023-01-28 11:42 UTC | newest]

Thread overview: 74+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-07 19:28 [PR PATCH] pipewire: use a conffile to autostart p-m-s CameronNemo
2022-08-17 19:20 ` [PR PATCH] [Updated] " CameronNemo
2022-08-20 22:22 ` pipewire: use a drop-in " paper42
2022-08-21  6:03 ` CameronNemo
2022-08-21  6:06 ` CameronNemo
2022-08-21  6:07 ` CameronNemo
2022-09-05 18:57 ` [PR PATCH] [Updated] " CameronNemo
2022-09-08  3:06 ` pipewire: update to 0.3.57, " ericonr
2022-09-08  5:28 ` CameronNemo
2022-09-08  5:30 ` CameronNemo
2022-09-20 12:21 ` CameronNemo
2022-09-20 12:29 ` Duncaen
2022-09-20 18:20 ` CameronNemo
2022-09-20 18:24 ` Duncaen
2022-09-20 18:30 ` Duncaen
2022-09-20 18:32 ` Duncaen
2022-09-20 18:35 ` Duncaen
2022-09-20 18:53 ` CameronNemo
2022-09-20 21:24 ` CameronNemo
2022-12-09 22:40 ` leahneukirchen
2022-12-09 22:53 ` JamiKettunen
2022-12-09 22:54 ` JamiKettunen
2022-12-09 23:04 ` JamiKettunen
2022-12-10  3:25 ` CameronNemo
2022-12-10  6:58 ` [PR PATCH] [Updated] " CameronNemo
2022-12-10  7:10 ` [PR PATCH] [Updated] [RFC] pipewire: split p-m-s into separate package, do not autostart session manager by default CameronNemo
2022-12-10  7:16 ` CameronNemo
2023-01-13  7:06 ` [PR PATCH] [Updated] " CameronNemo
2023-01-13  7:41 ` CameronNemo
2023-01-13  8:33 ` CameronNemo
2023-01-22 23:39 ` motorto
2023-01-23  3:58 ` oreo639
2023-01-23  4:05 ` oreo639
2023-01-23  4:15 ` oreo639
2023-01-23  4:19 ` oreo639
2023-01-23  4:20 ` oreo639
2023-01-23  4:21 ` oreo639
2023-01-23  4:24 ` oreo639
2023-01-23  4:31 ` oreo639
2023-01-23  4:34 ` oreo639
2023-01-23  4:36 ` oreo639
2023-01-23  4:39 ` oreo639
2023-01-23  5:42 ` oreo639
2023-01-23  6:08 ` oreo639
2023-01-23  6:09 ` oreo639
2023-01-23  6:42 ` oreo639
2023-01-23  6:45 ` oreo639
2023-01-23  6:45 ` oreo639
2023-01-23  6:46 ` oreo639
2023-01-23  6:47 ` oreo639
2023-01-23  6:48 ` oreo639
2023-01-23  7:22 ` oreo639
2023-01-23  8:02 ` oreo639
2023-01-23  8:02 ` oreo639
2023-01-23  8:02 ` oreo639
2023-01-23  8:03 ` oreo639
2023-01-23  8:04 ` oreo639
2023-01-23  8:05 ` oreo639
2023-01-23  8:05 ` oreo639
2023-01-23  8:05 ` oreo639
2023-01-23  8:05 ` oreo639
2023-01-23  8:08 ` oreo639
2023-01-23  8:09 ` oreo639
2023-01-23  9:10 ` oreo639
2023-01-23 22:30 ` CameronNemo
2023-01-23 22:30 ` CameronNemo
2023-01-25 14:53 ` ahesford
2023-01-25 15:40 ` CameronNemo
2023-01-25 15:52 ` ahesford
2023-01-25 15:54 ` ahesford
2023-01-25 15:54 ` CameronNemo
2023-01-25 15:54 ` [PR PATCH] [Closed]: " CameronNemo
2023-01-25 16:31 ` ahesford
2023-01-28 11:42 ` oreo639

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