Merge branch 'main' into 26.326.3

13 files changed, 28 insertions, 23 deletions

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 4b007ceec9..3e1dab7c00 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -154,7 +154,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
         --param asan-stack=0
       )
       add_link_options(-fsanitize=address)
-  elseif( NOT USE_FLATPAK )
+  elseif( NOT (${LINUX_DISTRO} MATCHES freedesktop) )
    add_compile_definitions( _FORTIFY_SOURCE=2 )
   endif()
 
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index b7ada1cfb1..ef541388d8 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -5,7 +5,7 @@ include_guard()
 
 add_library( ll::apr INTERFACE IMPORTED )
 
-if (NOT USE_FLATPAK)
+if (NOT (${LINUX_DISTRO} MATCHES freedesktop))
   if (WINDOWS)
     target_include_directories(ll::apr SYSTEM INTERFACE ${prefix_result}/../include)
     target_link_directories(ll::apr INTERFACE ${prefix_result})
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index a6e60aa95b..9746704907 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -28,10 +28,10 @@ elseif (WINDOWS)
     message(WARNING "Could not detect Boost suffix via glob; using fallback '${sfx}'. "
                     "Check that vcpkg installed boost into ${prefix_result}.")
   endif ()
-elseif (NOT USE_FLATPAK)
+elseif (NOT (${LINUX_DISTRO} MATCHES freedesktop))
   find_package( Boost )
 endif ()
-if (NOT USE_FLATPAK)
+if (NOT (${LINUX_DISTRO} MATCHES freedesktop))
   target_link_libraries( ll::boost INTERFACE
     boost_context${sfx}
     boost_fiber${sfx}
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index 452e2afbbf..489caa5d52 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -284,7 +284,7 @@ elseif (DARWIN)
         WORKING_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE}
     )
 elseif (LINUX)
-    if (NOT USE_FLATPAK)
+    if (NOT (${LINUX_DISTRO} MATCHES freedesktop))
         execute_process(
             COMMAND patchelf --set-rpath ${INSTALL_LIBRARY_DIR} dullahan_host
             WORKING_DIRECTORY ${LIBS_PREBUILT_DIR}/bin/release
diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index 270b4c09a6..005e548f08 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -8,8 +8,13 @@ target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1)
 #use_prebuilt_binary(discord_sdk)
 
 if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_sdk_installed OR NOT ${discord_sdk_installed} EQUAL 0)
+    if (${LINUX_DISTRO} MATCHES gentoo)
+        set(PREFIX_PATH /var/cache/distfiles)
+    else ()
+        set(PREFIX_PATH $ENV{HOME}/Downloads)
+    endif ()
     file(ARCHIVE_EXTRACT
-        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.10.18247.zip
+        INPUT ${PREFIX_PATH}/DiscordSocialSdk-1.10.18247.zip
         DESTINATION ${CMAKE_BINARY_DIR}
         )
     file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/discord_sdk)
diff --git a/indra/cmake/GLM.cmake b/indra/cmake/GLM.cmake
index d804774ff6..c7d0ec3aed 100644
--- a/indra/cmake/GLM.cmake
+++ b/indra/cmake/GLM.cmake
@@ -4,7 +4,7 @@ include(Prebuilt)
 add_library( ll::glm INTERFACE IMPORTED )
 
 #use_system_binary( glm )
-if (USE_FLATPAK OR (${LINUX_DISTRO} MATCHES debian) OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64))
+if (${LINUX_DISTRO} MATCHES freedesktop OR (${LINUX_DISTRO} MATCHES debian) OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64 OR ($ENV{MSYSTEM_CARCH} MATCHES aarch64))
 use_prebuilt_binary(glm)
 elseif (NOT WINDOWS)
   find_package( glm REQUIRED )
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index a574bfadaa..144f92118b 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -21,7 +21,7 @@ endif()
 #use_system_binary( colladadom )
 
 #use_prebuilt_binary(colladadom)
-if (USE_FLATPAK)
+if (${LINUX_DISTRO} MATCHES freedesktop)
 use_prebuilt_binary(minizip-ng) # needed for colladadom
 #use_prebuilt_binary(libxml2)
 
@@ -49,12 +49,12 @@ endif()
 endif (FALSE)
 
 include(FindPkgConfig)
-if (NOT USE_FLATPAK)
+if (NOT (${LINUX_DISTRO} MATCHES freedesktop))
     pkg_search_module(Minizip REQUIRED minizip)
 endif ()
 if (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES gentoo) OR DARWIN OR WINDOWS)
     set(Minizip_INCLUDE_DIRS ${Minizip_INCLUDE_DIRS}/minizip)
-elseif (USE_FLATPAK)
+elseif (${LINUX_DISTRO} MATCHES freedesktop)
     set(Minizip_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/minizip-ng)
     set(Minizip_LIBRARY_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
 endif ()
@@ -129,7 +129,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
             COMMAND sed -i "" -e "s/linux/FreeBSD/" dae/daeUtils.cpp
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r11/src
         )
-    elseif (USE_FLATPAK)
+    elseif (${LINUX_DISTRO} MATCHES freedesktop)
         set(BOOST_CFLAGS -I${LIBS_PREBUILT_DIR}/include)
         set(BOOST_LIBS -L${ARCH_PREBUILT_DIRS_RELEASE})
     endif ()
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index e8cd051021..7ff9a9e651 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -27,7 +27,7 @@ if (DARWIN)
     target_include_directories( ll::libvlc SYSTEM INTERFACE /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/include)
     target_link_directories( ll::libvlc INTERFACE /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/lib)
     target_link_libraries( ll::libvlc INTERFACE vlc vlccore )
-elseif (WINDOWS OR USE_FLATPAK)
+elseif (WINDOWS OR (${LINUX_DISTRO} MATCHES freedesktop))
 use_prebuilt_binary(vlc-bin)
     if (WINDOWS)
         set(LIB_SUFFIX lib)
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index dcb74ad36d..94c3b0fcf6 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -18,11 +18,11 @@ endif()
 
 if (USE_OPENAL)
   add_library( ll::openal INTERFACE IMPORTED )
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
   target_include_directories( ll::openal SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include/AL")
   endif ()
   target_compile_definitions( ll::openal INTERFACE LL_OPENAL=1)
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
   use_prebuilt_binary(openal)
       file(REMOVE
           ${ARCH_PREBUILT_DIRS_RELEASE}/libopenal.so
@@ -48,7 +48,7 @@ if (USE_OPENAL)
   endif ()
 
   include(FindPkgConfig)
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
       pkg_search_module(Openal REQUIRED openal)
   find_library(ALUT_LIBRARY
       NAMES
diff --git a/indra/cmake/OpenGL.cmake b/indra/cmake/OpenGL.cmake
index 5e00eff3b8..feaedf16e5 100644
--- a/indra/cmake/OpenGL.cmake
+++ b/indra/cmake/OpenGL.cmake
@@ -4,7 +4,7 @@ include(Variables)
 include(Prebuilt)
 include(FindOpenGL)
 
-if (USE_FLATPAK)
+if (${LINUX_DISTRO} MATCHES freedesktop)
   add_library(ll::glu INTERFACE IMPORTED)
   use_prebuilt_binary(glu)
   target_link_libraries(ll::glu INTERFACE GLU)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index 24dc121533..058d00d49d 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -6,7 +6,7 @@ include(GLIB)
 add_library( ll::uilibraries INTERFACE IMPORTED )
 
 if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
   use_prebuilt_binary(fltk)
   endif ()
   target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 )
@@ -15,7 +15,7 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     return()
   endif()
 
-  if (USE_FLATPAK OR (${LINUX_DISTRO} MATCHES debian) OR (${LINUX_DISTRO} MATCHES ubuntu))
+  if (${LINUX_DISTRO} MATCHES freedesktop OR (${LINUX_DISTRO} MATCHES debian) OR (${LINUX_DISTRO} MATCHES ubuntu))
     include(FindPkgConfig)
     pkg_check_modules(CAIRO REQUIRED cairo)
     target_include_directories(ll::uilibraries SYSTEM INTERFACE ${CAIRO_INCLUDE_DIRS})
@@ -54,7 +54,7 @@ if( WINDOWS )
           )
 endif()
 
-if (USE_FLATPAK)
+if (${LINUX_DISTRO} MATCHES freedesktop)
 target_include_directories( ll::uilibraries SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include
         )
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index 34c3ed0ec9..70107fea9a 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -6,7 +6,7 @@ set(INSTALL OFF CACHE BOOL
     "Generate install target.")
 
 if (INSTALL)
-  if (USE_FLATPAK OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+  if (${LINUX_DISTRO} MATCHES freedesktop OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
       set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH
           "Top-level installation directory.")
   else ()
@@ -14,7 +14,7 @@ if (INSTALL)
       "Top-level installation directory.")
   endif ()
 
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
     set(_LIB lib)
   elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
     set(_LIB lib/${ARCH}-linux-gnu/${VIEWER_BINARY_NAME})
@@ -37,7 +37,7 @@ if (INSTALL)
   set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/${VIEWER_BINARY_NAME}
       CACHE PATH
       "Installation directory for read-only data files.")
-  if (USE_FLATPAK)
+  if (${LINUX_DISTRO} MATCHES freedesktop)
     set(APP_LIBEXEC_DIR ${INSTALL_PREFIX}/libexec
         CACHE PATH
         "Installation directory for non-manual executables.")
diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake
index 8a2bbe160b..5efca62032 100644
--- a/indra/cmake/ViewerMiscLibs.cmake
+++ b/indra/cmake/ViewerMiscLibs.cmake
@@ -7,7 +7,7 @@ if (NOT (DARWIN OR WINDOWS))
   target_link_libraries( ll::fontconfig INTERFACE  Fontconfig::Fontconfig )
 endif ()
 
-if (DARWIN OR USE_FLATPAK)
+if (DARWIN OR (${LINUX_DISTRO} MATCHES freedesktop))
 use_prebuilt_binary(nanosvg)
 endif ()
 use_prebuilt_binary(viewer-fonts)