Merge branch 'main' into 26.3

4 files changed, 33 insertions, 12 deletions

diff --git a/README.md b/README.md
index 300504a763..6e15ce8036 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ $ su -
 # portmaster devel/cmake devel/pkgconf audio/freealut devel/apr1 devel/boost-libs x11-toolkits/fltk math/glm textproc/hunspell misc/meshoptimizer archivers/minizip graphics/nanosvg www/libnghttp2 graphics/openjpeg devel/sdl20 multimedia/vlc audio/libvorbis devel/xxhash
 # exit
 $ setenv LL_BUILD "-O3 -std=c++20 -fPIC"
-$ setenv PYTHON /usr/local/bin/python3.11
+$ setenv PYTHON `which python3.12`
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON ../indra
 $ make -j`nproc`
 $ cd ..
diff --git a/autobuild.xml b/autobuild.xml
index 54b29f26ae..d11a3c86a0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -52,7 +52,7 @@
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/3p-fltk/releases/download/v1.3.9-r1/fltk-1.3.9.8556992788-linux64-8556992788.tar.zst</string>
+              <string>https://megapahit.net/downloads/fltk-1.4.3-linux64.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index 225f44b1fb..e65d0cac71 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -16,20 +16,20 @@ if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR CMAKE_
 elseif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND NOT (${LINUX_DISTRO} MATCHES gentoo))
 use_prebuilt_binary(meshoptimizer)
 elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0)
-  if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz)
+  if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz)
     file(DOWNLOAD
-      https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz
-      ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
+      https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.2.tar.gz
+      ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz
       )
   endif ()
   file(ARCHIVE_EXTRACT
-    INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
+    INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.2.tar.gz
     DESTINATION ${CMAKE_BINARY_DIR}
     )
   try_compile(MESHOPTIMIZER_RESULT
     PROJECT meshoptimizer
-    SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
-    BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
+    SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.2
+    BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.2
     TARGET meshoptimizer
     CMAKE_FLAGS
       -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -42,7 +42,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
   if (${MESHOPTIMIZER_RESULT})
     execute_process(
       COMMAND ${CMAKE_MAKE_PROGRAM} install
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.2
       OUTPUT_VARIABLE meshoptimizer_installed
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index a5e6971248..24dc121533 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -15,10 +15,10 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
     return()
   endif()
 
-  if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+  if (USE_FLATPAK 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})
+    pkg_check_modules(CAIRO REQUIRED cairo)
+    target_include_directories(ll::uilibraries SYSTEM INTERFACE ${CAIRO_INCLUDE_DIRS})
   endif ()
 
   target_link_libraries( ll::uilibraries INTERFACE
@@ -58,4 +58,25 @@ if (USE_FLATPAK)
 target_include_directories( ll::uilibraries SYSTEM INTERFACE
         ${LIBS_PREBUILT_DIR}/include
         )
+  pkg_check_modules(CAIRO-XLIB REQUIRED cairo-xlib)
+  pkg_check_modules(DBUS-1 REQUIRED dbus-1)
+  pkg_check_modules(LIBDECOR-0 REQUIRED libdecor-0)
+  pkg_check_modules(PANGO REQUIRED pango)
+  pkg_check_modules(PANGOCAIRO REQUIRED pangocairo)
+  pkg_check_modules(WAYLAND-CLIENT REQUIRED wayland-client)
+  pkg_check_modules(WAYLAND-CURSOR REQUIRED wayland-cursor)
+  pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
+  pkg_check_modules(XKBCOMMON-X11 REQUIRED xkbcommon-x11)
+  target_link_libraries(ll::uilibraries INTERFACE
+        ${CAIRO_LIBRARIES}
+        ${CAIRO-XLIB_LIBRARIES}
+        ${DBUS-1_LIBRARIES}
+        ${LIBDECOR-0_LIBRARIES}
+        ${PANGO_LIBRARIES}
+        ${PANGOCAIRO_LIBRARIES}
+        ${WAYLAND-CLIENT_LIBRARIES}
+        ${WAYLAND-CURSOR_LIBRARIES}
+        ${XKBCOMMON_LIBRARIES}
+        ${XKBCOMMON-X11_LIBRARIES}
+        )
 endif ()