From 1f22b997e2457199fa2bad7faaa305297c0abc5a Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Wed, 17 Aug 2022 12:09:49 -0700 Subject: [PATCH 1/2] pipewire: update to 0.3.57 --- ...15d0c0c66b64c7198a34ad3c4b43445667d2.patch | 22 ------------------- .../patches/autostart-media-session.patch | 17 -------------- ...fd46262b1a90ad94f86e34216a1a886d9463.patch | 22 ------------------- srcpkgs/pipewire/template | 4 ++-- 4 files changed, 2 insertions(+), 63 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 -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 -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..e3ad5d89c5ab 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.56 +version=0.3.57 revision=1 _pms_version=0.4.1 build_style=meson @@ -34,7 +34,7 @@ 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 https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz" -checksum="e73d8897daac8f9e61a23193ed71971682715a5997cb553d809bc61a349ef03c +checksum="2cda522dffb26d806e073c5c2631884bec102f9227f23ac8e2bf06d0d8a97522 119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" From add2734380f473d9ef1ebad7c2577d7809250166 Mon Sep 17 00:00:00 2001 From: Cameron Nemo 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 e3ad5d89c5ab..d05baf9ed852 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -63,6 +63,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