From 93b7b56180bdb1d59cc0c089742c5e77680e2f51 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 22 Apr 2025 21:19:05 +0800 Subject: Exempt Gentoo from PipeWire too Pipewire in Portage has been upgraded from 1.2.7 to 1.4.2 recently. Among our supported distros, Debian and Ubuntu are the only ones left whose Pipewire versions are still 1.2.7, hence the changed logics. --- indra/media_plugins/cef/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 199465f698..bf1e990450 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -49,7 +49,7 @@ if (LINUX) linux/volume_catcher_pipewire.cpp ) - if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)) + if (NOT (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))) message( "Building with Linux volume catcher for PulseAudio only and cancelling PipeWire" ) list(REMOVE_ITEM LINUX_VOLUME_CATCHER linux/volume_catcher_pipewire.cpp) endif () @@ -76,7 +76,7 @@ add_library(media_plugin_cef ${media_plugin_cef_SOURCE_FILES} ) -if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))) +if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu)) target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1) endif () -- cgit v1.2.3