[gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/

["Sam James" <sam@gentoo.org>]

commit:     b30d06275a07b58afce9912aafaa86d28bd5985e
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Jun 30 20:33:56 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul  1 08:19:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30d0627

media-video/pipewire: fix automagic USE=gsettings when USE=bluetooth

And the reverse. If USE="-bluetooth", the gsettings detection gets reset
to not-found.

Bug: https://bugs.gentoo.org/935139
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/pipewire-1.0.7-automagic-gsettings.patch | 80 ++++++++++++++++++++++
 .../files/pipewire-1.2.0-automagic-gsettings.patch | 79 +++++++++++++++++++++
 media-video/pipewire/pipewire-1.0.7.ebuild         |  2 +
 media-video/pipewire/pipewire-1.2.0.ebuild         |  2 +
 4 files changed, 163 insertions(+)

diff --git a/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch
new file mode 100644
index 000000000000..bde229b80b24
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch
@@ -0,0 +1,80 @@
+From acc75b21f653873ec1da68bfa08f2945a8dd09d2 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+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.
+
+(cherry picked from commit b5f031bc15524bbfde577290ad9bbadeab77ae8b)
+Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
+---
+ meson.build             | 4 ++--
+ spa/meson.build         | 6 +++---
+ src/modules/meson.build | 4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 0ea256e9b..3353a2aec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -343,8 +343,8 @@ 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')
++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')
+ 
+ gst_option = get_option('gstreamer')
+ gst_deps_def = {
+diff --git a/spa/meson.build b/spa/meson.build
+index db0a84425..e37744b08 100644
+--- a/spa/meson.build
++++ b/spa/meson.build
+@@ -43,12 +43,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 1b434b7f6..52660253e 100644
+--- a/src/modules/meson.build
++++ b/src/modules/meson.build
+@@ -409,11 +409,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)
+ endif
+ 
+-- 
+2.44.2
+

diff --git a/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch b/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch
new file mode 100644
index 000000000000..ab102a606c82
--- /dev/null
+++ b/media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch
@@ -0,0 +1,79 @@
+From b5f031bc15524bbfde577290ad9bbadeab77ae8b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+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/media-video/pipewire/pipewire-1.0.7.ebuild b/media-video/pipewire/pipewire-1.0.7.ebuild
index e2e457730428..fa900f161e78 100644
--- a/media-video/pipewire/pipewire-1.0.7.ebuild
+++ b/media-video/pipewire/pipewire-1.0.7.ebuild
@@ -178,6 +178,8 @@ PATCHES=(
 	# https://bugs.gentoo.org/933218
 	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2028
 	"${FILESDIR}"/${P}-automagic-webrtc-audio-processing.patch
+	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061
+	"${FILESDIR}"/${P}-automagic-gsettings.patch
 )
 
 pkg_setup() {

diff --git a/media-video/pipewire/pipewire-1.2.0.ebuild b/media-video/pipewire/pipewire-1.2.0.ebuild
index 785496b22c13..f4aeba1f7ea4 100644
--- a/media-video/pipewire/pipewire-1.2.0.ebuild
+++ b/media-video/pipewire/pipewire-1.2.0.ebuild
@@ -175,6 +175,8 @@ PDEPEND=">=media-video/wireplumber-0.5.2"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
+	# https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/2061
+	"${FILESDIR}"/${P}-automagic-gsettings.patch
 )
 
 pkg_setup() {