From fdab529aedd71d1283aef9370cd0fe1bfbec34f2 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Wed, 10 Jul 2024 18:25:22 -0400 Subject: [PATCH] pipewire: update to 1.2.0 --- .../patches/fix-conflicting-meson-deps.patch | 79 +++++++++++++++++++ srcpkgs/pipewire/template | 8 +- srcpkgs/pipewire/update | 1 - 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch delete mode 100644 srcpkgs/pipewire/update diff --git a/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch new file mode 100644 index 00000000000..ab102a606c8 --- /dev/null +++ b/srcpkgs/pipewire/patches/fix-conflicting-meson-deps.patch @@ -0,0 +1,79 @@ +From b5f031bc15524bbfde577290ad9bbadeab77ae8b Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Sun, 30 Jun 2024 13:44:06 -0400 +Subject: [PATCH] meson: fix conflicting use of feature-based dependency + lookups + +When spa-plugins is enabled, the gio-2.0 global dependency is +overwritten. + +When bluez support is enabled, OR when gsettings is enabled, the gio-2.0 +dependency is then detected as found. This means that +pipewire-module-protocol-pulse can end up enabling gsettings support +even if it has been forcibly turned off. + +Rename the meson variables to ensure they are looked up separately. +--- + meson.build | 6 +++--- + spa/meson.build | 6 +++--- + src/modules/meson.build | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/meson.build b/meson.build +index 2607c5c8f4..38b6b59d00 100644 +--- a/meson.build ++++ b/meson.build +@@ -346,9 +346,9 @@ summary({'GLib-2.0 (Flatpak support)': glib2_dep.found()}, bool_yn: true, sectio + flatpak_support = glib2_dep.found() + cdata.set('HAVE_GLIB2', flatpak_support) + +-gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings')) +-summary({'GIO (GSettings)': gio_dep.found()}, bool_yn: true, section: 'Misc dependencies') +-if not gio_dep.found() and get_option('gsettings-pulse-schema').enabled() ++gsettings_gio_dep = dependency('gio-2.0', version : '>= 2.26.0', required : get_option('gsettings')) ++summary({'GIO (GSettings)': gsettings_gio_dep.found()}, bool_yn: true, section: 'Misc dependencies') ++if not gsettings_gio_dep.found() and get_option('gsettings-pulse-schema').enabled() + error('`gsettings-pulse-schema` is enabled but `gio` was not found.') + endif + +diff --git a/spa/meson.build b/spa/meson.build +index 67e4b5c506..cf25609dab 100644 +--- a/spa/meson.build ++++ b/spa/meson.build +@@ -47,12 +47,12 @@ if get_option('spa-plugins').allowed() + summary({'ALSA': alsa_dep.found()}, bool_yn: true, section: 'Backend') + + bluez_dep = dependency('bluez', version : '>= 4.101', required: get_option('bluez5')) +- gio_dep = dependency('gio-2.0', required : get_option('bluez5')) +- gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5')) ++ bluez_gio_dep = dependency('gio-2.0', required : get_option('bluez5')) ++ bluez_gio_unix_dep = dependency('gio-unix-2.0', required : get_option('bluez5')) + bluez_glib2_dep = dependency('glib-2.0', required : get_option('bluez5')) + sbc_dep = dependency('sbc', required: get_option('bluez5')) + summary({'SBC': sbc_dep.found()}, bool_yn: true, section: 'Bluetooth audio codecs') +- bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, gio_dep, gio_unix_dep ] ++ bluez5_deps = [ mathlib, dbus_dep, sbc_dep, bluez_dep, bluez_glib2_dep, bluez_gio_dep, bluez_gio_unix_dep ] + bluez_deps_found = get_option('bluez5').allowed() + foreach dep: bluez5_deps + if get_option('bluez5').enabled() and not dep.found() +diff --git a/src/modules/meson.build b/src/modules/meson.build +index ceaa7013d9..3f400f0877 100644 +--- a/src/modules/meson.build ++++ b/src/modules/meson.build +@@ -433,11 +433,11 @@ if avahi_dep.found() + cdata.set('HAVE_AVAHI', true) + endif + +-if gio_dep.found() ++if gsettings_gio_dep.found() + pipewire_module_protocol_pulse_sources += [ + 'module-protocol-pulse/modules/module-gsettings.c', + ] +- pipewire_module_protocol_pulse_deps += gio_dep ++ pipewire_module_protocol_pulse_deps += gsettings_gio_dep + cdata.set('HAVE_GIO', true) + if get_option('gsettings-pulse-schema').enabled() + install_data(['module-protocol-pulse/modules/org.freedesktop.pulseaudio.gschema.xml'], +-- +GitLab + diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 761a174a52b..425e19891ed 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=1.0.7 +version=1.2.0 revision=1 build_style=meson configure_args=" @@ -15,6 +15,8 @@ configure_args=" -Dudevrulesdir=/usr/lib/udev/rules.d -Dvulkan=enabled -Dbluez5-codec-lc3plus=disabled + -Dgsettings-pulse-schema=disabled + -Dsnap=disabled -Dsession-managers=[] -Drlimits-match=@_pipewire $(vopt_feature ffado libffado) @@ -27,7 +29,7 @@ makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel vulkan-loader-devel pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel libmysofa-devel opus-devel $(vopt_if ffado libffado-devel) liblc3-devel - $(vopt_if selinux libselinux-devel) libcamera-devel" + $(vopt_if selinux libselinux-devel) libcamera-devel libcap-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" @@ -38,7 +40,7 @@ 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=9c45eef65e66224804ae8671849452a7f221e913813072b3aad346f20df666a8 +checksum=477eb1245a66a982345404b57fab1b9f402c12292047c4d9bea90d6445374653 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire" system_accounts="_pipewire" diff --git a/srcpkgs/pipewire/update b/srcpkgs/pipewire/update deleted file mode 100644 index 239ca88a92f..00000000000 --- a/srcpkgs/pipewire/update +++ /dev/null @@ -1 +0,0 @@ -ignore="1.1.*" # ignore v1.2 release candidates