diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-05-18 18:49:04 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-05-18 18:49:04 +0800 |
| commit | 54e1494fda4976626897c3de5e6148655ddb8895 (patch) | |
| tree | 3417a343f19351ad95ae4679b2e51e6dfcdf71a2 | |
| parent | 9563f50118f9b24518d8124605f7c2b4045381fc (diff) | |
Revert "Exempt Ubuntu from Pipewire too"
This reverts commit b8cc57486f3c15fd40d3524204c7fc0db3b7b8d4.
| -rw-r--r-- | indra/media_plugins/cef/CMakeLists.txt | 11 |
1 files 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} |