Github messages for voidlinux
 help / color / mirror / Atom feed
From: CameronNemo <CameronNemo@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] pipewire: use a conffile to autostart p-m-s
Date: Wed, 17 Aug 2022 21:20:25 +0200	[thread overview]
Message-ID: <20220817192025.cPLgKkrb1x691ZL1VsnfGbXcjx9WJr5l6_-02K9Up5A@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38521@inbox.vuxu.org>

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

There is an updated 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: 7154 bytes --]

From c01b6e4a1fa738654bde8475f938bcdb2243eedb Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 17 Aug 2022 12:09:49 -0700
Subject: [PATCH 1/2] pipewire: update to
 0532d194ad91ade044487c9a041b79d02c8a4c36

---
 ...15d0c0c66b64c7198a34ad3c4b43445667d2.patch | 22 -------------------
 .../patches/autostart-media-session.patch     | 17 --------------
 ...fd46262b1a90ad94f86e34216a1a886d9463.patch | 22 -------------------
 srcpkgs/pipewire/template                     |  8 ++++---
 4 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/pipewire/patches/aaa015d0c0c66b64c7198a34ad3c4b43445667d2.patch
 delete mode 100644 srcpkgs/pipewire/patches/autostart-media-session.patch
 delete mode 100644 srcpkgs/pipewire/patches/f857fd46262b1a90ad94f86e34216a1a886d9463.patch

diff --git a/srcpkgs/pipewire/patches/aaa015d0c0c66b64c7198a34ad3c4b43445667d2.patch b/srcpkgs/pipewire/patches/aaa015d0c0c66b64c7198a34ad3c4b43445667d2.patch
deleted file mode 100644
index f9117fdf638e..000000000000
--- a/srcpkgs/pipewire/patches/aaa015d0c0c66b64c7198a34ad3c4b43445667d2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 Jul 2022 13:06:52 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
----
- spa/plugins/avb/avbtp/packets.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spa/plugins/avb/avbtp/packets.h b/spa/plugins/avb/avbtp/packets.h
-index 7047456bf..3d4a652ee 100644
---- a/spa/plugins/avb/avbtp/packets.h
-+++ b/spa/plugins/avb/avbtp/packets.h
-@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
- 	unsigned gv:1;
- 	unsigned tv:1;
- 
--	uint8_t seq_number;
-+	uint8_t seq_num;
- 
- 	unsigned _r2:7;
- 	unsigned tu:1;
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/patches/f857fd46262b1a90ad94f86e34216a1a886d9463.patch b/srcpkgs/pipewire/patches/f857fd46262b1a90ad94f86e34216a1a886d9463.patch
deleted file mode 100644
index eeab0079253f..000000000000
--- a/srcpkgs/pipewire/patches/f857fd46262b1a90ad94f86e34216a1a886d9463.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 Jul 2022 14:07:16 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
----
- src/modules/module-avb/iec61883.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/modules/module-avb/iec61883.h b/src/modules/module-avb/iec61883.h
-index d3b3a7daa..6ca8724ad 100644
---- a/src/modules/module-avb/iec61883.h
-+++ b/src/modules/module-avb/iec61883.h
-@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
- 	unsigned gv:1;
- 	unsigned tv:1;
- 
--	uint8_t seq_number;
-+	uint8_t seq_num;
- 
- 	unsigned _r2:7;
- 	unsigned tu:1;
diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 220bf2f68b6b..149b719da9f7 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,7 +1,9 @@
 # Template file for 'pipewire'
 pkgname=pipewire
 version=0.3.56
-revision=1
+revision=81
+_commit=0532d194ad91ade044487c9a041b79d02c8a4c36
+wrksrc="pipewire-${_commit}"
 _pms_version=0.4.1
 build_style=meson
 configure_args="
@@ -32,9 +34,9 @@ maintainer="Stefano Ragni <stefano.ragni@outlook.com>"
 license="MIT"
 homepage="https://pipewire.org/"
 changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz
+distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${_commit}/pipewire-${_commit}.tar.gz
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="e73d8897daac8f9e61a23193ed71971682715a5997cb553d809bc61a349ef03c
+checksum="7203baa60cb34e9c3569e30d1af9f874546109f9ee20ffab730a11d3a16a6d0a
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From 5f344d4e305700c05e36aeedee93393979e07dee Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 7 Aug 2022 12:26:05 -0700
Subject: [PATCH 2/2] 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 /usr/share/pipewire/pipewire.conf.d that can be overridden.
---
 srcpkgs/pipewire/files/10-autostart-session-manager.conf | 6 ++++++
 srcpkgs/pipewire/template                                | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 srcpkgs/pipewire/files/10-autostart-session-manager.conf

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/template b/srcpkgs/pipewire/template
index 149b719da9f7..e716757e5ccd 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -65,6 +65,7 @@ post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 	vsv pipewire
 	vsv pipewire-pulse
+	vinstall "${FILESDIR}/10-autostart-session-manager.conf" 644 usr/share/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

  reply	other threads:[~2022-08-17 19:20 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-07 19:28 [PR PATCH] " CameronNemo
2022-08-17 19:20 ` CameronNemo [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220817192025.cPLgKkrb1x691ZL1VsnfGbXcjx9WJr5l6_-02K9Up5A@z \
    --to=cameronnemo@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).