Exempt Tumbleweed from PipeWire

since they upgraded to 1.3.83 from stable 1.2.7 and there seem to be API
changes and we're not ready for them yet.

2 files changed, 11 insertions, 0 deletions

diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 007b74eda7..4c0abcda97 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -49,6 +49,11 @@ if (LINUX)
     linux/volume_catcher_pipewire.cpp 
   )
 
+  if (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)
+    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,6 +76,10 @@ add_library(media_plugin_cef
     ${media_plugin_cef_SOURCE_FILES}
     )
 
+if (NOT (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+    target_compile_definitions(media_plugin_cef PRIVATE USE_VOLUME_CATCHER_PW=1)
+endif ()
+
 #add_dependencies(media_plugin_cef
 #  ${MEDIA_PLUGIN_BASE_LIBRARIES}
 #)
diff --git a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
index 7d33242063..ba2ed1aa56 100644
--- a/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
+++ b/indra/media_plugins/cef/linux/volume_catcher_linux.cpp
@@ -37,12 +37,14 @@ void VolumeCatcher::onEnablePipeWireVolumeCatcher(bool enable)
     if (pimpl != nullptr)
         return;
 
+#if USE_VOLUME_CATCHER_PW
     if (enable)
     {
         LL_DEBUGS() << "volume catcher using pipewire" << LL_ENDL;
         pimpl = new VolumeCatcherPipeWire();
     }
     else
+#endif
     {
         LL_DEBUGS() << "volume catcher using pulseaudio" << LL_ENDL;
         pimpl = new VolumeCatcherPulseAudio();