From 54e1494fda4976626897c3de5e6148655ddb8895 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Mon, 18 May 2026 18:49:04 +0800 Subject: Revert "Exempt Ubuntu from Pipewire too" This reverts commit b8cc57486f3c15fd40d3524204c7fc0db3b7b8d4. --- indra/media_plugins/cef/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 502be8774b..06c47d423c 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -46,9 +46,14 @@ if (LINUX) set(LINUX_VOLUME_CATCHER linux/volume_catcher_linux.cpp linux/volume_catcher_pulseaudio.cpp - #linux/volume_catcher_pipewire.cpp + linux/volume_catcher_pipewire.cpp ) + if (NOT (${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 () + list(APPEND media_plugin_cef_SOURCE_FILES ${LINUX_VOLUME_CATCHER}) set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id -Wl,-rpath,'$ORIGIN:$ORIGIN/../../lib'") list(APPEND media_plugin_cef_LINK_LIBRARIES llwindow ) @@ -71,7 +76,9 @@ add_library(media_plugin_cef ${media_plugin_cef_SOURCE_FILES} ) -#target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1) +if (${LINUX_DISTRO} MATCHES ubuntu) + target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1) +endif () #add_dependencies(media_plugin_cef # ${MEDIA_PLUGIN_BASE_LIBRARIES} -- cgit v1.3