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 DCF4415802E 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 47F80E2A76; Mon, 1 Jul 2024 08:20:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 0A63AE2A76 for ; Mon, 1 Jul 2024 08:20:02 +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 C2E6833BE12 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 2F8FF1BC0 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: <1719821952.f91e6697fba4b081fff1cc188040c34aee59ea58.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/pipewire/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/pipewire/pipewire-1.2.0.ebuild media-video/pipewire/pipewire-9999.ebuild X-VCS-Directories: media-video/pipewire/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f91e6697fba4b081fff1cc188040c34aee59ea58 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: 68b6e12a-5067-4b30-9757-03404c2c1295 X-Archives-Hash: 0784f9b4c5b71569476a66b8c4a9e4a9 commit: f91e6697fba4b081fff1cc188040c34aee59ea58 Author: Eli Schwartz gmail com> AuthorDate: Sun Jun 30 15:36:54 2024 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 1 08:19:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91e6697 media-video/pipewire: fix file conflicts with pulseaudio-daemon We don't *have* to be replacing it as the sound server, that's why a USE flag exists for precisely that. But pipewire 1.2.0+ offers to install files from pulseaudio-daemon on the theory it can be replacing it... which means we need to tell it not to do so when USE="-sound-server". Previously, we installed this whenever gsettings was enabled, even though its purpose was to enable API usage independent of being the main sound server. Closes: https://bugs.gentoo.org/935139 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> media-video/pipewire/pipewire-1.2.0.ebuild | 11 ++++++++++- media-video/pipewire/pipewire-9999.ebuild | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/media-video/pipewire/pipewire-1.2.0.ebuild b/media-video/pipewire/pipewire-1.2.0.ebuild index bffc3587f167..785496b22c13 100644 --- a/media-video/pipewire/pipewire-1.2.0.ebuild +++ b/media-video/pipewire/pipewire-1.2.0.ebuild @@ -205,7 +205,6 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) - $(meson_native_use_feature gsettings gsettings-pulse-schema) $(meson_native_use_feature systemd) $(meson_native_use_feature system-service systemd-system-service) @@ -280,6 +279,16 @@ multilib_src_configure() { -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure } diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index bffc3587f167..785496b22c13 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -205,7 +205,6 @@ multilib_src_configure() { $(meson_native_use_feature gstreamer) $(meson_native_use_feature gstreamer gstreamer-device-provider) $(meson_native_use_feature gsettings) - $(meson_native_use_feature gsettings gsettings-pulse-schema) $(meson_native_use_feature systemd) $(meson_native_use_feature system-service systemd-system-service) @@ -280,6 +279,16 @@ multilib_src_configure() { -Dsnap=disabled ) + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + meson_src_configure }