From 7008e499a3d05ca8a9df2dcdc49b4f0de5045731 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Tue, 27 Jun 2023 15:43:58 -0400 Subject: [PATCH] pipewire: update to 0.3.72, adopt --- .../patches/jack-fix-notify-skip.patch | 50 ------------------- srcpkgs/pipewire/template | 14 +++--- 2 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/pipewire/patches/jack-fix-notify-skip.patch diff --git a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch b/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch deleted file mode 100644 index fed37727a636..000000000000 --- a/srcpkgs/pipewire/patches/jack-fix-notify-skip.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ce71b37b58d5e251ae7acda0799f696688df11c2 Mon Sep 17 00:00:00 2001 -From: Wim Taymans -Date: Thu, 18 May 2023 09:59:26 +0200 -Subject: [PATCH] jack: update bufsize and samplerate when skipping notify - -When we skip the notify because we are not active or we don't have a -callback, still update the buffer_size and sample_rate fields or else -we will keep on trying forever. - -Fixes #3226 ---- - pipewire-jack/src/pipewire-jack.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c -index 0c8363ea3..20feb2462 100644 ---- a/pipewire-jack/src/pipewire-jack.c -+++ b/pipewire-jack/src/pipewire-jack.c -@@ -1027,8 +1027,6 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1, - struct notify *notify; - bool emit = false;; - -- if ((type & NOTIFY_ACTIVE_FLAG) && !c->active) -- return 0; - switch (type) { - case NOTIFY_TYPE_REGISTRATION: - emit = c->registration_callback != NULL && o != NULL; -@@ -1060,8 +1058,18 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1, - default: - break; - } -+ if ((type & NOTIFY_ACTIVE_FLAG) && !c->active) -+ emit = false; - if (!emit) { -- pw_log_debug("%p: skip notify %d", c, type); -+ switch (type) { -+ case NOTIFY_TYPE_BUFFER_FRAMES: -+ c->buffer_frames = arg1; -+ break; -+ case NOTIFY_TYPE_SAMPLE_RATE: -+ c->sample_rate = arg1; -+ break; -+ } -+ pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active); - if (o != NULL && arg1 == 0 && o->removing) { - o->removing = false; - free_object(c, o); --- -GitLab - diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 3e0cffb69a3c..5320cb07f6a4 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,7 +1,7 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.3.71 -revision=3 +version=0.3.72 +revision=1 build_style=meson configure_args=" --auto-features=enabled @@ -16,6 +16,7 @@ configure_args=" -Dbluez5-codec-lc3plus=disabled -Dsession-managers=[] -Drlimits-match=@_pipewire + -Dlibffado=$(vopt_if ffado enabled disabled) " hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel" makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel @@ -23,22 +24,23 @@ 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 opus-devel" + libmysofa-devel opus-devel $(vopt_if ffado libffado-devel)" depends="libspa-alsa>=${version}_${revision} libspa-audioconvert>=${version}_${revision} libspa-audiomixer>=${version}_${revision} libspa-control>=${version}_${revision} libspa-v4l2>=${version}_${revision} pulseaudio-utils virtual?pipewire-session-manager" checkdepends="pulseaudio-utils" short_desc="Server and user space API to deal with multimedia pipelines" -maintainer="Stefano Ragni " +maintainer="cinerea0 " 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" -checksum=070dcf83c514903d603351921c7829014c8d9162c49ae5a043290c920f6a6363 +checksum=eb11d03e7c700e0d9204624fd3116f165f104c37eff30e93e7ac6df763e93829 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" -build_options="sdl2" +build_options="ffado sdl2" +desc_option_ffado="Enable support for FireWire based audio devices" replaces="libpulseaudio-pipewire>=0"