Exempt Ubuntu from Pipewire too

Effectively all Un*x distros now.

1 files changed, 2 insertions, 9 deletions

diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 042b658d75..f6f7c21fa5 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -46,14 +46,9 @@ 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 )
@@ -76,9 +71,7 @@ add_library(media_plugin_cef
     ${media_plugin_cef_SOURCE_FILES}
     )
 
-if (${LINUX_DISTRO} MATCHES ubuntu)
-    target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1)
-endif ()
+#target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1)
 
 #add_dependencies(media_plugin_cef
 #  ${MEDIA_PLUGIN_BASE_LIBRARIES}