commit: f91e6697fba4b081fff1cc188040c34aee59ea58 Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com> AuthorDate: Sun Jun 30 15:36:54 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <eschwartz93 <AT> gmail.com> Signed-off-by: Sam James <sam <AT> 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 }
