Merge branch 'main' into 26.3

3 files changed, 7 insertions, 33 deletions

diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 81942a5799..1fc28ad415 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -306,7 +306,9 @@ elseif (LINUX)
                 bin/release/chrome-sandbox
                 bin/release/dullahan_host
                 lib/release/libEGL.so
+                lib/release/libGLESv2.so
                 lib/release/libvk_swiftshader.so
+                lib/release/libvulkan.so.1
             WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}
         )
     endif ()
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 06118dd19e..1a4d61616c 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -194,9 +194,11 @@ if (INSTALL)
         if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES fedora)))
             install(
                 FILES
+                    ${ARCH_PREBUILT_DIRS_RELEASE}/libEGL.so
+                    ${ARCH_PREBUILT_DIRS_RELEASE}/libGLESv2.so
                     ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so
                     ${ARCH_PREBUILT_DIRS_RELEASE}/libvk_swiftshader.so
-                    ${ARCH_PREBUILT_DIRS_RELEASE}/libEGL.so
+                    ${ARCH_PREBUILT_DIRS_RELEASE}/libvulkan.so.1
                     ${ARCH_PREBUILT_DIRS_RELEASE}/v8_context_snapshot.bin
                     ${ARCH_PREBUILT_DIRS_RELEASE}/vk_swiftshader_icd.json
                     ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak
@@ -209,36 +211,6 @@ if (INSTALL)
                 DIRECTORY ${AUTOBUILD_INSTALL_DIR}/resources/locales
                 DESTINATION ${_LIB}
             )
-            file(MAKE_DIRECTORY ${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME})
-            if (USE_FLATPAK)
-              file(CREATE_LINK
-                  "/usr/lib/${ARCH}-linux-gnu/libGLESv2.so.2"
-                  "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libGLESv2.so"
-                  SYMBOLIC
-              )
-              file(CREATE_LINK
-                  "/usr/lib/${ARCH}-linux-gnu/libvulkan.so.1"
-                  "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libvulkan.so.1"
-                  SYMBOLIC
-              )
-            else ()
-              file(CREATE_LINK
-                  "../libGLESv2.so"
-                  "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libGLESv2.so"
-                  SYMBOLIC
-              )
-              file(CREATE_LINK
-                  "../libvulkan.so.1"
-                  "${AUTOBUILD_INSTALL_DIR}/lib/release/${VIEWER_BINARY_NAME}/libvulkan.so.1"
-                  SYMBOLIC
-              )
-            endif ()
-            install(
-                FILES
-                    ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libGLESv2.so
-                    ${ARCH_PREBUILT_DIRS_RELEASE}/${VIEWER_BINARY_NAME}/libvulkan.so.1
-                DESTINATION ${_LIB}
-            )
         endif ()
     elseif (WINDOWS)
         set(_LIB llplugin)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c1c15a5b88..4092b4f0aa 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2373,10 +2373,10 @@ if (LINUX)
       set(CPACK_DEBIAN_PACKAGE_SECTION net
         CACHE STRING "Debian package section.")
       if (${LINUX_DISTRO} MATCHES debian)
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base"
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.83.0, libboost-filesystem1.83.0, libboost-program-options1.83.0, libboost-regex1.83.0, libboost-thread1.83.0, libboost-url1.83.0, libexpat1, libfltk1.4, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base"
           CACHE STRING "Debian package dependencies.")
       else ()
-        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libfltk1.4, libgles-dev, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base"
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libalut0, libaprutil1t64, libboost-fiber1.90.0, libboost-filesystem1.90.0, libboost-program-options1.90.0, libboost-regex1.90.0, libboost-thread1.90.0, libboost-url1.90.0, libexpat1, libfltk1.4, libglu1-mesa, libhunspell-1.7-0, libmeshoptimizer2d, libminizip1t64, libnghttp2-14, libnspr4, libnss3, libopenjp2-7, libsdl2-2.0-0, libvlc5, libvorbisenc2, libvorbisfile3, vlc-plugin-base"
         CACHE STRING "Debian package dependencies.")
       endif ()
     elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))