Update CEF to 139 & Dullahan to 1.25/1.24 on Linux

For convenience, on x86-64 we choose the next closest version that has
prebuilt binary so we don't have to build (we could, I've tried and it
worked too). While on aarch64, we have to compile like before and we
choose the same Dullahan version too as on Windows and macOS, for this
parity branch with SLv's.

3 files changed, 13 insertions, 18 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 357ec9f952..571da61367 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -500,7 +500,7 @@
               <key>hash_algorithm</key>
               <string>sha1</string>
               <key>url</key>
-              <string>https://github.com/secondlife/dullahan/releases/download/v1.14.0-r3/dullahan-1.14.0.202408091637_118.4.1_g3dd6078_chromium-118.0.5993.54-linux64-10322607516.tar.zst</string>
+              <string>https://github.com/secondlife/dullahan/releases/download/v1.25.0-CEF_139.0.40/dullahan-1.25.0.202510152245_139.0.40_g465474a_chromium-139.0.7258.139-linux64-18544680875.tar.zst</string>
             </map>
             <key>name</key>
             <string>linux64</string>
diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake
index b9c2b64f66..8078575c45 100644
--- a/indra/cmake/CEFPlugin.cmake
+++ b/indra/cmake/CEFPlugin.cmake
@@ -8,48 +8,44 @@ add_library( ll::cef INTERFACE IMPORTED )
 
 if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
     if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/dullahan_installed OR NOT ${dullahan_installed} EQUAL 0)
-        if (NOT EXISTS ${CMAKE_BINARY_DIR}/v1.14.0-r3.tar.gz)
+        if (NOT EXISTS ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40.tar.gz)
             file(DOWNLOAD
-                https://github.com/secondlife/dullahan/archive/refs/tags/v1.14.0-r3.tar.gz
-                ${CMAKE_BINARY_DIR}/v1.14.0-r3.tar.gz
+                https://github.com/secondlife/dullahan/archive/refs/tags/v1.24.0-CEF_139.0.40.tar.gz
+                ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40.tar.gz
                 )
         endif ()
         file(ARCHIVE_EXTRACT
-            INPUT ${CMAKE_BINARY_DIR}/v1.14.0-r3.tar.gz
+            INPUT ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40.tar.gz
             DESTINATION ${CMAKE_BINARY_DIR}
             )
         execute_process(
             COMMAND sed -i "/#include <vector>/a #include <cstdint>" dullahan.h
-            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3/src
+            WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/src
             )
         file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/cef)
         try_compile(DULLAHAN_RESULT
             PROJECT dullahan
-            SOURCE_DIR ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3
-            BINARY_DIR ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3
+            SOURCE_DIR ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40
+            BINARY_DIR ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40
             CMAKE_FLAGS
                 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-                -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-                -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${CMAKE_OSX_DEPLOYMENT_TARGET}
                 -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR}
                 -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE}
                 -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
-                -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
                 -DUSE_SPOTIFY_CEF:BOOL=ON
-                -DSPOTIFY_CEF_URL:STRING=https://cef-builds.spotifycdn.com/cef_binary_118.4.1%2Bg3dd6078%2Bchromium-118.0.5993.54_linuxarm64_beta_minimal.tar.bz2
+                -DSPOTIFY_CEF_URL:STRING=https://cef-builds.spotifycdn.com/cef_binary_139.0.40%2Bg465474a%2Bchromium-139.0.7258.139_linuxarm64_minimal.tar.bz2
                 -DPROJECT_ARCH:STRING=${CMAKE_SYSTEM_PROCESSOR}
-                -DENABLE_CXX11_ABI:BOOL=ON
         )
         if (${DULLAHAN_RESULT})
             execute_process(
                 COMMAND ${CMAKE_MAKE_PROGRAM} install
-                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3
+                WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40
                 OUTPUT_VARIABLE dullahan_installed
             )
             file(
                 COPY
-                    ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3/src/dullahan.h
-                    ${CMAKE_BINARY_DIR}/dullahan-1.14.0-r3/src/dullahan_version.h
+                    ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/src/dullahan.h
+                    ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/src/dullahan_version.h
                 DESTINATION ${LIBS_PREBUILT_DIR}/include/cef
                 )
             file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "${dullahan_installed}")
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 2603c92f26..e759d85ae5 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -172,8 +172,7 @@ if (INSTALL)
             FILES
                 ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so
                 ${ARCH_PREBUILT_DIRS_RELEASE}/libvk_swiftshader.so
-                ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin
-                ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin
+                ${AUTOBUILD_INSTALL_DIR}/lib/release/v8_context_snapshot.bin
                 ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak
                 ${AUTOBUILD_INSTALL_DIR}/resources/chrome_200_percent.pak
                 ${AUTOBUILD_INSTALL_DIR}/resources/icudtl.dat