3 files changed, 11 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 34f1b83b6d..39f3bdce6d 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1015,7 +1015,7 @@ void LLPluginClassMedia::enableMediaPluginDebugging( bool enable )
     sendMessage( message );
 }
 
-#if LL_LINUX
+#if LL_LINUX || __FreeBSD__
 void LLPluginClassMedia::enablePipeWireVolumeCatcher( bool enable )
 {
     LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "enable_pipewire_volume_catcher");
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 91901719d3..944108aa10 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -134,7 +134,7 @@ public:
     // Text may be unicode (utf8 encoded)
     bool textInput(const std::string &text, MASK modifiers, LLSD native_key_data);
 
-#if LL_LINUX
+#if LL_LINUX || __FreeBSD__
     void enablePipeWireVolumeCatcher( bool enable );
 #endif
 
diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 38f4c92b09..f7adb9404b 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -61,6 +61,13 @@ elseif (DARWIN)
   )
 endif ()
 
+if (CMAKE_BUILD_TYPE MATCHES Release AND (CMAKE_CXX_COMPILER_ID STREQUAL Clang OR CMAKE_CXX_COMPILER_ID MATCHES GNU))
+  add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_STRIP} ${PROJECT_NAME}
+    )
+endif ()
+
 if (BUILD_SHARED_LIBS)
   set_target_properties(SLPlugin PROPERTIES LINK_FLAGS_RELEASE
     "${LINK_FLAGS_RELEASE} -Wl,--allow-shlib-undefined")
@@ -69,6 +76,8 @@ endif ()
 if (INSTALL)
   if (DARWIN OR WINDOWS)
     install(TARGETS ${PROJECT_NAME} DESTINATION .)
+  elseif (USE_FLATPAK)
+    install(TARGETS ${PROJECT_NAME} DESTINATION libexec)
   elseif (${LINUX_DISTRO} MATCHES arch)
     install(TARGETS ${PROJECT_NAME} DESTINATION lib/${VIEWER_BINARY_NAME})
   else ()