From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 38A6115802E for ; Mon, 1 Jul 2024 08:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1090AE2A77; Mon, 1 Jul 2024 08:20:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEDC9E2A77 for ; Mon, 1 Jul 2024 08:20:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D054E33BE26 for ; Mon, 1 Jul 2024 08:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 449321DA6 for ; Mon, 1 Jul 2024 08:19:59 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1719821953.b30d06275a07b58afce9912aafaa86d28bd5985e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/files/, media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/files/pipewire-1.0.7-automagic-gsettings.patch media-video/pipewire/files/pipewire-1.2.0-automagic-gsettings.patch media-video/pipewire/pipewire-1.0.7.ebuild media-video/pipewire/pipewire-1.2.0.ebuild X-VCS-Directories: media-video/pipewire/ media-video/pipewire/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b30d06275a07b58afce9912aafaa86d28bd5985e X-VCS-Branch: master Date: Mon, 1 Jul 2024 08:19:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 97f47f00-6b1b-4022-ab08-bd949bac54a6 X-Archives-Hash: 46f9c27f4dd95b67e53c79877e88f041 commit: b30d06275a07b58afce9912aafaa86d28bd5985e Author: Eli Schwartz gmail com> AuthorDate: Sun Jun 30 20:33:56 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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 +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 +--- + 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 +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() {