From 9e38c0d9cb2083336fe609699c8fa0923db0ce03 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Sat, 22 Apr 2023 13:33:13 -0400 Subject: [PATCH] pipewire: update to 0.3.70 --- .../patches/autostart-media-session.patch | 16 ++++++++++------ srcpkgs/pipewire/template | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch index c5753a3719c2..6418cada31cc 100644 --- a/srcpkgs/pipewire/patches/autostart-media-session.patch +++ b/srcpkgs/pipewire/patches/autostart-media-session.patch @@ -2,16 +2,20 @@ 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 +diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in +index 697bf094d3..d4db26897b 100644 +--- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -236,7 +236,7 @@ +@@ -294,8 +294,10 @@ context.exec = [ # 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@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" +- @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } ++ { path = "@session_manager_path@" ++ args = "@session_manager_args@" ++ @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] ++ } # # 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 f2d161227deb..b17849a3e4dd 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.68 +version=0.3.70 revision=1 _pms_version=0.4.2 build_wrksrc="${pkgname}-${version}" @@ -26,7 +26,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel - libmysofa-devel" + libmysofa-devel opus-devel" depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision} libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision} libspa-v4l2>=${version}_${revision} pulseaudio-utils" @@ -38,7 +38,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="fdcf7f2ee881cdc91ef54b3a558e431bdb3395f7a1e9044753c7a89346fafd91 +checksum="e9a86d592dea6ee28c67b82c17bd6ba10afd1c880decfcf4b3e7c5421f146d38 4cf8577d4431e08b0e6f29c1ad6bf8662765ab66986ea6f0151883101811c119" make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire"