Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c

19 files changed, 146 insertions, 123 deletions

diff --git a/indra/cmake/00-COMPILE-LINK-RUN.txt b/indra/cmake/00-COMPILE-LINK-RUN.txt
index 1933072a6d..6cff0c0f28 100644
--- a/indra/cmake/00-COMPILE-LINK-RUN.txt
+++ b/indra/cmake/00-COMPILE-LINK-RUN.txt
@@ -162,7 +162,7 @@ Linking
 
     *  Update the autobuild.xml of ALL consumers of the library.  In
     the case of zlib, that meant updating freetype, libpng, openssl,
-    libxml2, fontconfig, curl, Boost, SDL, llqtwebkit, google-mock and
+    libxml2, fontconfig, curl, Boost, SDL2, llqtwebkit, google-mock and
     colladadom.
 
     *  Confirm by test and observation that the consumers actually use
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index b31b077abd..bdeff9a8df 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -161,36 +161,15 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
       -mfpmath=sse
       -pthread
   )
-
   if (NOT BUILD_SHARED_LIBS)
     add_compile_options(-fvisibility=hidden)
   endif (NOT BUILD_SHARED_LIBS)
 
-  set(GCC_CLANG_COMPATIBLE_WARNINGS
-      -Wno-parentheses
-      -Wno-deprecated
-      -Wno-c++20-compat
-      -Wno-pessimizing-move
-  )
-
-  set(CLANG_WARNINGS
-      ${GCC_CLANG_COMPATIBLE_WARNINGS}
-      # Put clang specific warning configuration here
-  )
-
-  set(GCC_WARNINGS
-      ${GCC_CLANG_COMPATIBLE_WARNINGS}
-      -Wno-dangling-pointer
-  )
-
   add_link_options(
           -Wl,--no-keep-memory
           -Wl,--build-id
           -Wl,--no-undefined
   )
-  if (NOT GCC_DISABLE_FATAL_WARNINGS)
-    add_compile_options( -Werror )
-  endif (NOT GCC_DISABLE_FATAL_WARNINGS)
 
   # this stops us requiring a really recent glibc at runtime
   add_compile_options(-fno-stack-protector)
@@ -201,9 +180,6 @@ if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
             -lstdc++
             -lm
     )
-    add_compile_options(${CLANG_WARNINGS})
-  else()
-    add_compile_options(${GCC_WARNINGS})
   endif()
 endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 
@@ -212,7 +188,7 @@ if (DARWIN)
   set(CLANG_DISABLE_FATAL_WARNINGS OFF)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-Wno-unused-local-typedef -Wno-deprecated-declarations")
+  set(DARWIN_extra_cstar_flags "-Wno-deprecated-declarations")
   # Ensure that CMAKE_CXX_FLAGS has the correct -g debug information format --
   # see Variables.cmake.
   string(REPLACE "-gdwarf-2" "-g${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}"
@@ -221,22 +197,26 @@ if (DARWIN)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
   # NOTE: it's critical that the optimization flag is put in front.
   # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-## Really?? On developer machines too?
-##set(ENABLE_SIGNING TRUE)
-##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
+  ## Really?? On developer machines too?
+  ##set(ENABLE_SIGNING TRUE)
+  ##set(SIGNING_IDENTITY "Developer ID Application: Linden Research, Inc.")
 
   # required for clang-15/xcode-15 since our boost package still uses deprecated std::unary_function/binary_function
   # see https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#C++-Standard-Library
   add_compile_definitions(_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION)
+endif(DARWIN)
 
-  set(GCC_WARNINGS -Wall -Wno-sign-compare -Wno-trigraphs)
+if(LINUX OR DARWIN)
+  add_compile_options(-Wall -Wno-sign-compare -Wno-trigraphs -Wno-reorder -Wno-unused-but-set-variable -Wno-unused-variable -Wno-unused-local-typedef)
 
-  list(APPEND GCC_WARNINGS -Wno-reorder -Wno-non-virtual-dtor )
-
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 13)
-    list(APPEND GCC_WARNINGS -Wno-unused-but-set-variable -Wno-unused-variable )
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    add_compile_options(-Wno-stringop-truncation -Wno-parentheses -Wno-c++20-compat)
   endif()
 
+  if (NOT GCC_DISABLE_FATAL_WARNINGS)
+    add_compile_options(-Werror)
+  endif ()
+
   add_compile_options(${GCC_WARNINGS})
   add_compile_options(-m${ADDRESS_SIZE})
-endif ()
+endif (LINUX OR DARWIN)
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 3c4c0ef1a7..9d92c5a65d 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -30,11 +30,6 @@ if (WINDOWS)
         debug ${ARCH_PREBUILT_DIRS_DEBUG}/libvorbis.lib
     )
 else (WINDOWS)
-  target_link_libraries(ll::vorbis INTERFACE
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libogg.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisenc.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbisfile.a
-        ${ARCH_PREBUILT_DIRS_RELEASE}/libvorbis.a
-        )
+  target_link_libraries(ll::vorbis INTERFACE vorbisfile vorbis ogg vorbisenc )
 endif (WINDOWS)
 
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 5525ac9f24..dbc6693bf7 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -41,6 +41,7 @@ set(cmake_SOURCE_FILES
         LLTestCommand.cmake
         LLWindow.cmake
         Linking.cmake
+        Lualibs.cmake
         Meshoptimizer.cmake
         NDOF.cmake
         OPENAL.cmake
@@ -52,6 +53,7 @@ set(cmake_SOURCE_FILES
         Prebuilt.cmake
         PulseAudio.cmake
         Python.cmake
+        SDL2.cmake
         TemplateCheck.cmake
         TinyEXR.cmake
         TinyGLTF.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 6ac00fd131..e98c77497b 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -54,6 +54,7 @@ if(WINDOWS)
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         openjp2.dll
+        SDL2.dll
         )
 
     if(LLCOMMON_LINK_SHARED)
@@ -106,7 +107,8 @@ if(WINDOWS)
         else(ADDRESS_SIZE EQUAL 32)
             set(redist_find_path "$ENV{VCTOOLSREDISTDIR}x64\\Microsoft.VC${MSVC_TOOLSET_VER}.CRT")
         endif(ADDRESS_SIZE EQUAL 32)
-        get_filename_component(redist_path "${redist_find_path}" ABSOLUTE)
+        get_filename_component(redist_path_component "${redist_find_path}" ABSOLUTE)
+        set(redist_path ${redist_path_component} CACHE INTERNAL "MSVC Redist Path" FORCE)
         MESSAGE(STATUS "VC Runtime redist path: ${redist_path}")
     endif (MSVC_TOOLSET_VER AND DEFINED ENV{VCTOOLSREDISTDIR})
 
@@ -132,12 +134,11 @@ if(WINDOWS)
             msvcp${MSVC_VER}_2.dll
             msvcp${MSVC_VER}_atomic_wait.dll
             msvcp${MSVC_VER}_codecvt_ids.dll
-            msvcr${MSVC_VER}.dll
             vcruntime${MSVC_VER}.dll
             vcruntime${MSVC_VER}_1.dll
             vcruntime${MSVC_VER}_threads.dll
             )
-        if(redist_path AND EXISTS "${redist_path}/${release_msvc_file}")
+        if(DEFINED redist_path AND EXISTS "${redist_path}/${release_msvc_file}")
             MESSAGE(STATUS "Copying redist file from ${redist_path}/${release_msvc_file}")
             to_staging_dirs(
                 ${redist_path}
@@ -169,6 +170,8 @@ elseif(DARWIN)
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
         libndofdev.dylib
+        libSDL2.dylib
+        libSDL2-2.0.dylib
        )
 
     if(LLCOMMON_LINK_SHARED)
@@ -197,6 +200,7 @@ elseif(LINUX)
         libortp.so
         libvivoxoal.so.1
         libvivoxsdk.so
+        libSDL2.so
         )
     set(slvoice_files SLVoice)
 
@@ -214,16 +218,8 @@ elseif(LINUX)
 
      if( USE_AUTOBUILD_3P )
          list( APPEND release_files
-                 libatk-1.0.so
-                 libfreetype.so.6.6.2
-                 libfreetype.so.6
-                 libopenjp2.so
-                 libuuid.so.16
-                 libuuid.so.16.0.22
-                 libfontconfig.so.1.8.0
-                 libfontconfig.so.1
-                 libgmodule-2.0.so
-                 libgobject-2.0.so
+                 libapr-1.so.0
+                 libaprutil-1.so.0
                  )
 
         if(LLCOMMON_LINK_SHARED)
diff --git a/indra/cmake/FreeType.cmake b/indra/cmake/FreeType.cmake
index 7683fe364a..e531a9e508 100644
--- a/indra/cmake/FreeType.cmake
+++ b/indra/cmake/FreeType.cmake
@@ -19,6 +19,8 @@ target_include_directories( ll::freetype SYSTEM INTERFACE  ${LIBS_PREBUILT_DIR}/
 
 if (WINDOWS)
     target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/freetype.lib)
+elseif( LINUX )
+    target_link_libraries( ll::freetype INTERFACE ${LIBS_PREBUILT_DIR}/lib/release/libfreetype.a ${LIBS_PREBUILT_DIR}/lib/release/libpng16.a)
 else()
     target_link_libraries( ll::freetype INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libfreetype.a)
 endif()
diff --git a/indra/cmake/Havok.cmake b/indra/cmake/Havok.cmake
index c544440adc..64e33f6c83 100644
--- a/indra/cmake/Havok.cmake
+++ b/indra/cmake/Havok.cmake
@@ -27,26 +27,26 @@ else (LL_DEBUG_HAVOK)
 endif (LL_DEBUG_HAVOK)
 
 set(HAVOK_LIBS
-    hkBase
-    hkCompat
+    hkgpConvexDecomposition
     hkGeometryUtilities
-    hkInternal
     hkSerialize
     hkSceneData
     hkpCollide
     hkpUtilities
     hkpConstraintSolver
     hkpDynamics
-    hkpInternal
-    hkaiInternal
     hkaiPathfinding
     hkaiAiPhysicsBridge
-    hkcdInternal
     hkcdCollide
     hkpVehicle
     hkVisualize
     hkaiVisualize
-    hkgpConvexDecomposition
+    hkaiInternal
+    hkcdInternal
+    hkpInternal
+    hkInternal
+    hkCompat
+    hkBase
 )
 
 unset(HK_DEBUG_LIBRARIES)
@@ -60,16 +60,22 @@ if (DEBUG_PREBUILT)
     # but making it pretty is a lot more work
     message(STATUS "${ARGN}")
   endfunction(DEBUG_MESSAGE)
+  function(DEBUG_EXEC_FUNC)
+    execute_process(COMMAND ${ARGN})
+  endfunction(DEBUG_EXEC_FUNC)
 else (DEBUG_PREBUILT)
   # without DEBUG_PREBUILT, DEBUG_MESSAGE() is a no-op
   function(DEBUG_MESSAGE)
   endfunction(DEBUG_MESSAGE)
+  function(DEBUG_EXEC_FUNC)
+    execute_process(COMMAND ${ARGN} OUTPUT_QUIET)
+  endfunction(DEBUG_EXEC_FUNC)
 endif (DEBUG_PREBUILT)
 
 # DEBUG_EXEC() reports each execute_process() before invoking
 function(DEBUG_EXEC)
   DEBUG_MESSAGE(${ARGN})
-  execute_process(COMMAND ${ARGN})
+  DEBUG_EXEC_FUNC(${ARGN})
 endfunction(DEBUG_EXEC)
 
 # *TODO: Figure out why we need to extract like this...
@@ -79,9 +85,7 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
   find_library(HAVOK_RELWITHDEBINFO_LIB_${HAVOK_LIB} ${HAVOK_LIB} PATHS ${HAVOK_RELWITHDEBINFO_LIBRARY_PATH})
 
   if(LINUX)
-    set(debug_dir "${HAVOK_DEBUG_LIBRARY_PATH}/${HAVOK_LIB}")
     set(release_dir "${HAVOK_RELEASE_LIBRARY_PATH}/${HAVOK_LIB}")
-    set(relwithdebinfo_dir "${HAVOK_RELWITHDEBINFO_LIBRARY_PATH}/${HAVOK_LIB}")
 
     # Try to avoid extracting havok library each time we run cmake.
     if("${havok_${HAVOK_LIB}_extracted}" STREQUAL "" AND EXISTS "${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted")
@@ -92,8 +96,8 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
     if(${PREBUILD_TRACKING_DIR}/havok_source_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/havok_${HAVOK_LIB}_extracted OR NOT ${havok_${HAVOK_LIB}_extracted} EQUAL 0)
       DEBUG_MESSAGE("Extracting ${HAVOK_LIB}...")
 
-      foreach(lib ${debug_dir} ${release_dir} ${relwithdebinfo_dir})
-        DEBUG_EXEC("mkdir" ${lib})
+      foreach(lib ${release_dir})
+        DEBUG_EXEC("mkdir" "-p" ${lib})
         DEBUG_EXEC("ar" "-xv" "../lib${HAVOK_LIB}.a"
           WORKING_DIRECTORY ${lib})
       endforeach(lib)
@@ -104,17 +108,12 @@ foreach(HAVOK_LIB ${HAVOK_LIBS})
 
     endif()
 
-    file(GLOB extracted_debug "${debug_dir}/*.o")
     file(GLOB extracted_release "${release_dir}/*.o")
-    file(GLOB extracted_relwithdebinfo "${relwithdebinfo_dir}/*.o")
-
-    DEBUG_MESSAGE("extracted_debug ${debug_dir}/*.o")
     DEBUG_MESSAGE("extracted_release ${release_dir}/*.o")
-    DEBUG_MESSAGE("extracted_relwithdebinfo ${relwithdebinfo_dir}/*.o")
 
-    list(APPEND HK_DEBUG_LIBRARIES ${extracted_debug})
+    list(APPEND HK_DEBUG_LIBRARIES ${extracted_release})
     list(APPEND HK_RELEASE_LIBRARIES ${extracted_release})
-    list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_relwithdebinfo})
+    list(APPEND HK_RELWITHDEBINFO_LIBRARIES ${extracted_release})
   else(LINUX)
     # Win32
     list(APPEND HK_DEBUG_LIBRARIES   ${HAVOK_DEBUG_LIB_${HAVOK_LIB}})
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index 31907d31df..7792bee355 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -3,31 +3,11 @@
 include(Variables)
 include(GLEXT)
 include(Prebuilt)
+include(SDL2)
 
 include_guard()
-add_library( ll::SDL INTERFACE IMPORTED )
 
-if (USESYSTEMLIBS AND NOT (WINDOWS OR DARWIN))
-  include(FindPkgConfig)
-  pkg_check_modules(Sdl2 REQUIRED sdl2)
-  target_compile_definitions( ll::SDL INTERFACE LL_SDL=1)
-  target_include_directories(ll::SDL SYSTEM INTERFACE ${Sdl2_INCLUDE_DIRS})
-  target_link_directories(ll::SDL INTERFACE ${Sdl2_LIBRARY_DIRS})
-  if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    list(APPEND Sdl2_LIBRARIES X11)
-  endif ()
-  target_link_libraries(ll::SDL INTERFACE ${Sdl2_LIBRARIES})
-  return ()
-endif ()
-
-
-if (LINUX)
-  #Must come first as use_system_binary can exit this file early
-  target_compile_definitions( ll::SDL INTERFACE LL_SDL_VERSION=2 LL_SDL)
-
-  #find_package(SDL2 REQUIRED)
-  #target_link_libraries( ll::SDL INTERFACE SDL2::SDL2 SDL2::SDL2main X11)
-
-  use_prebuilt_binary(SDL2)
-  target_link_libraries( ll::SDL INTERFACE SDL2 X11)
-endif (LINUX)
+if (NOT (WINDOWS OR DARWIN))
+  # linux uses SDL2 for window and keyboard
+  target_compile_definitions( ll::SDL2 INTERFACE LL_USE_SDL_KEYBOARD=1 )
+endif (NOT (WINDOWS OR DARWIN))
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 8e91dac109..815e7479d0 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -7,6 +7,7 @@ set(ARCH_PREBUILT_DIRS ${AUTOBUILD_INSTALL_DIR}/lib)
 set(ARCH_PREBUILT_DIRS_PLUGINS ${AUTOBUILD_INSTALL_DIR}/plugins)
 set(ARCH_PREBUILT_DIRS_RELEASE ${AUTOBUILD_INSTALL_DIR}/lib/release)
 set(ARCH_PREBUILT_DIRS_DEBUG ${AUTOBUILD_INSTALL_DIR}/lib/debug)
+
 if (WINDOWS OR DARWIN )
   # Kludge for older cmake versions, 3.20+ is needed to use a genex in add_custom_command( OUTPUT <var> ... )
   # Using this will work okay-ish, as Debug is not supported anyway. But for property multi config and also
diff --git a/indra/cmake/Lualibs.cmake b/indra/cmake/Lualibs.cmake
new file mode 100644
index 0000000000..e1a7794a34
--- /dev/null
+++ b/indra/cmake/Lualibs.cmake
@@ -0,0 +1,29 @@
+# -*- cmake -*-
+
+include_guard()
+
+include(Prebuilt)
+
+add_library( ll::lualibs INTERFACE IMPORTED )
+
+#use_system_binary( lualibs )
+
+use_prebuilt_binary(luau)
+
+target_include_directories( ll::lualibs SYSTEM INTERFACE
+                            ${LIBS_PREBUILT_DIR}/include
+)
+
+if (WINDOWS)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Ast.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.CodeGen.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Compiler.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.Config.lib)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/Luau.VM.lib)
+else ()
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.CodeGen.a)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Compiler.a)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Config.a)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.VM.a)
+  target_link_libraries(ll::lualibs INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libLuau.Ast.a)
+endif ()
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 6555027dc1..2895b1fcf7 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -4,11 +4,7 @@ include(Prebuilt)
 
 include_guard()
 
-# ND: Turn this off by default, the openal code in the viewer isn't very well maintained, seems
-# to have memory leaks, has no option to play music streams
-# It probably makes sense to to completely remove it
-
-set(USE_OPENAL OFF CACHE BOOL "Enable OpenAL")
+set(USE_OPENAL ON CACHE BOOL "Enable OpenAL")
 # ND: To streamline arguments passed, switch from OPENAL to USE_OPENAL
 # To not break all old build scripts convert old arguments but warn about it
 if(OPENAL)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 051435e7cb..6f8faf635a 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -40,6 +40,7 @@ macro (use_prebuilt_binary _binary)
         --install-dir=${AUTOBUILD_INSTALL_DIR}
         ${_binary} ")
         endif(DEBUG_PREBUILT)
+        message(STATUS "Installing ${_binary}...")
         if(USESYSTEMLIBS)
             execute_process(COMMAND xmllint
                 --xpath
@@ -74,6 +75,8 @@ macro (use_prebuilt_binary _binary)
         else(USESYSTEMLIBS)
         execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
                 install
+                -A${ADDRESS_SIZE}
+                --skip-source-environment
                 --install-dir=${AUTOBUILD_INSTALL_DIR}
                 ${_binary}
                 WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake
index da5d2ef22c..39fd21c33f 100644
--- a/indra/cmake/Python.cmake
+++ b/indra/cmake/Python.cmake
@@ -13,7 +13,7 @@ elseif (WINDOWS)
   foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE)
     # prefer more recent Python versions to older ones, if multiple versions
     # are installed
-    foreach(pyver 3.12 3.11 3.10 3.9 3.8 3.7)
+    foreach(pyver 3.14 3.13 3.12 3.11 3.10 3.9 3.8 3.7)
       list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]")
     endforeach()
   endforeach()
diff --git a/indra/cmake/SDL2.cmake b/indra/cmake/SDL2.cmake
new file mode 100644
index 0000000000..2fa29241a3
--- /dev/null
+++ b/indra/cmake/SDL2.cmake
@@ -0,0 +1,31 @@
+# -*- cmake -*-
+cmake_minimum_required( VERSION 3.13 FATAL_ERROR )
+
+include(Linking)
+include( Prebuilt )
+include_guard()
+
+add_library( ll::SDL2 INTERFACE IMPORTED )
+
+if (USESYSTEMLIBS AND NOT (WINDOWS OR DARWIN))
+  include(FindPkgConfig)
+  pkg_check_modules(Sdl2 REQUIRED sdl2)
+  target_include_directories(ll::SDL2 SYSTEM INTERFACE ${Sdl2_INCLUDE_DIRS})
+  target_link_directories(ll::SDL2 INTERFACE ${Sdl2_LIBRARY_DIRS})
+  target_link_libraries(ll::SDL2 INTERFACE ${Sdl2_LIBRARIES})
+  return ()
+endif (USESYSTEMLIBS AND NOT (WINDOWS OR DARWIN))
+
+use_system_binary( SDL2 )
+use_prebuilt_binary( SDL2 )
+
+find_library( SDL2_LIBRARY
+    NAMES SDL2
+    PATHS "${LIBS_PREBUILT_DIR}/lib/release")
+if ( "${SDL2_LIBRARY}" STREQUAL "SDL2_LIBRARY-NOTFOUND" )
+    message( FATAL_ERROR "unable to find SDL2_LIBRARY" )
+endif()
+
+target_link_libraries( ll::SDL2 INTERFACE "${SDL2_LIBRARY}" )
+target_include_directories( ll::SDL2 SYSTEM INTERFACE "${LIBS_PREBUILT_DIR}/include" )
+
diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake
index a7eac2711f..9eee9eb57f 100644
--- a/indra/cmake/Tracy.cmake
+++ b/indra/cmake/Tracy.cmake
@@ -12,6 +12,11 @@ else()
     option(USE_TRACY "Use Tracy profiler." OFF)
 endif()
 
+if (LINUX)
+  # tracy currently conflicts with llcommon/stdtypes.h on linux.  keep it disabled until we fix it
+  set(USE_TRACY OFF)
+endif(LINUX)
+
 if (USE_TRACY)
   option(USE_TRACY_ON_DEMAND "Use on-demand Tracy profiling." ON)
   option(USE_TRACY_LOCAL_ONLY "Disallow remote Tracy profiling." OFF)
diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake
index a3423bb895..f70c3b8ec6 100644
--- a/indra/cmake/UI.cmake
+++ b/indra/cmake/UI.cmake
@@ -5,32 +5,38 @@ include(GLIB)
 
 add_library( ll::uilibraries INTERFACE IMPORTED )
 
-if (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  if (NOT USESYSTEMLIBS)
-  use_prebuilt_binary(fltk)
-  endif ()
-  target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 )
+if (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+  target_compile_definitions(ll::uilibraries INTERFACE LL_X11=1 )
 
   if( USE_CONAN )
     return()
   endif()
 
+  include(FindPkgConfig)
+  pkg_check_modules(WAYLAND_CLIENT wayland-client)
+
+  if( WAYLAND_CLIENT_FOUND )
+      target_compile_definitions( ll::uilibraries INTERFACE LL_WAYLAND=1)
+  else()
+      message("pkgconfig could not find wayland client, compiling without full wayland support")
+  endif()
+
   target_link_libraries( ll::uilibraries INTERFACE
-          fltk
           Xrender
           Xcursor
           Xfixes
           Xext
           Xft
           Xinerama
+          X11
           ll::fontconfig
           ll::freetype
-          ll::SDL
+          ll::SDL2
           ll::glib
           ll::gio
   )
 
-endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+endif (LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
 if( WINDOWS )
   target_link_libraries( ll::uilibraries INTERFACE
           opengl32
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index c287f135fe..0b15328421 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -120,7 +120,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(FIND_LIBRARY_USE_LIB64_PATHS ON)
   endif (ADDRESS_SIZE EQUAL 32)
 
-  execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH 
+  execute_process(COMMAND dpkg-architecture -a${DEB_ARCHITECTURE} -qDEB_HOST_MULTIARCH
       RESULT_VARIABLE DPKG_RESULT
       OUTPUT_VARIABLE DPKG_ARCH
       OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET)
diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake
index 509981d72c..0798d4f51f 100644
--- a/indra/cmake/bugsplat.cmake
+++ b/indra/cmake/bugsplat.cmake
@@ -1,13 +1,13 @@
-if (INSTALL_PROPRIETARY)
+if (INSTALL_PROPRIETARY AND NOT LINUX)
     # Note that viewer_manifest.py makes decision based on BUGSPLAT_DB and not USE_BUGSPLAT
     if (BUGSPLAT_DB)
         set(USE_BUGSPLAT ON  CACHE BOOL "Use the BugSplat crash reporting system")
     else (BUGSPLAT_DB)
         set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
     endif (BUGSPLAT_DB)
-else (INSTALL_PROPRIETARY)
+else (INSTALL_PROPRIETARY AND NOT LINUX)
     set(USE_BUGSPLAT OFF CACHE BOOL "Use the BugSplat crash reporting system")
-endif (INSTALL_PROPRIETARY)
+endif (INSTALL_PROPRIETARY AND NOT LINUX)
 
 include_guard()
 add_library( ll::bugsplat INTERFACE IMPORTED )
@@ -36,6 +36,6 @@ if (USE_BUGSPLAT)
 
     set_property( TARGET ll::bugsplat APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS LL_BUGSPLAT)
 else()
-    set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name")
+    set(BUGSPLAT_DB "" CACHE STRING "BugSplat crash database name" FORCE)
 endif (USE_BUGSPLAT)
 
diff --git a/indra/cmake/run_build_test.py b/indra/cmake/run_build_test.py
index 940a130a50..312d791d67 100755
--- a/indra/cmake/run_build_test.py
+++ b/indra/cmake/run_build_test.py
@@ -122,19 +122,17 @@ def main(command, arguments=[], libpath=[], vars={}):
     # Make sure we see all relevant output *before* child-process output.
     sys.stdout.flush()
     try:
-        return subprocess.call(command_list)
-    except OSError as err:
+        return subprocess.run(command_list).returncode
+    except FileNotFoundError as err:
         # If the caller is trying to execute a test program that doesn't
         # exist, we want to produce a reasonable error message rather than a
         # traceback. This happens when the build is halted by errors, but
         # CMake tries to proceed with testing anyway <eyeroll/>. However, do
         # NOT attempt to handle any error but "doesn't exist."
-        if err.errno != errno.ENOENT:
-            raise
         # In practice, the pathnames into CMake's build tree are so long as to
         # obscure the name of the test program. Just log its basename.
-        log.warn("No such program %s; check for preceding build errors" % \
-                 os.path.basename(command[0]))
+        log.warning("No such program %s; check for preceding build errors" %
+                    os.path.basename(command[0]))
         # What rc should we simulate for missing executable? Windows produces
         # 9009.
         return 9009