From 061200d25ce97d88f672cb1a563667aa5bce837d Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 9 Jun 2026 12:14:57 +0800 Subject: Upgrade Dullahan/CEF to 1.30.0/147.0.10 as per Hadet's recommendation, with the reason being a few CVEs on CEF 139. The linux64 part on autobuild.xml gets updated too even though it won't be used for Linux x86-64 because LL's prebuilt CEF for Linux is still 139. Dullahan will be self-built with Spotify CEF on both Linux architectures now. This change doesn't apply to Arch & Fedora which builds Dullahan but with their system CEF instead. The version on Arch is 148 (it was 147 last time) and the one on Fedora is still 146 which is not that far behind. --- autobuild.xml | 6 +++--- indra/cmake/CEFPlugin.cmake | 33 ++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 571da61367..cb60804347 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -486,7 +486,7 @@ hash_algorithm sha1 url - https://github.com/secondlife/dullahan/releases/download/v1.24.0-CEF_139.0.40/dullahan-1.24.0.202510081737_139.0.40_g465474a_chromium-139.0.7258.139-darwin64-18353103947.tar.zst + https://github.com/secondlife/dullahan/releases/download/v1.30.0-CEF_147.0.10/dullahan-1.30.0.202604261548_147.0.10_gd58e84d_chromium-147.0.7727.118-darwin64-24960603207.tar.zst name darwin64 @@ -500,7 +500,7 @@ hash_algorithm sha1 url - 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 + https://github.com/secondlife/dullahan/releases/download/v1.30.0-CEF_147.0.10/dullahan-1.30.0.202604261548_139.0.40_g465474a_chromium-139.0.7258.139-linux64-24960603207.tar.zst name linux64 @@ -514,7 +514,7 @@ hash_algorithm sha1 url - https://github.com/secondlife/dullahan/releases/download/v1.24.0-CEF_139.0.40/dullahan-1.24.0.202510081738_139.0.40_g465474a_chromium-139.0.7258.139-windows64-18353103947.tar.zst + https://github.com/secondlife/dullahan/releases/download/v1.30.0-CEF_147.0.10/dullahan-1.30.0.202604261550_147.0.10_gd58e84d_chromium-147.0.7727.118-windows64-24960603207.tar.zst name windows64 diff --git a/indra/cmake/CEFPlugin.cmake b/indra/cmake/CEFPlugin.cmake index 117c83353e..87335c9285 100644 --- a/indra/cmake/CEFPlugin.cmake +++ b/indra/cmake/CEFPlugin.cmake @@ -142,46 +142,49 @@ elseif (${LINUX_DISTRO} MATCHES fedora) file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "0") endif () endif () -elseif (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) +elseif (LINUX) 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}/dullahan-1.24.0-CEF_139.0.40.tar.gz) + if (NOT EXISTS ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10.tar.gz) file(DOWNLOAD - 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 - ) + https://github.com/secondlife/dullahan/archive/refs/tags/v1.30.0-CEF_147.0.10.tar.gz + ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10.tar.gz + ) endif () file(ARCHIVE_EXTRACT - INPUT ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40.tar.gz + INPUT ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10.tar.gz DESTINATION ${CMAKE_BINARY_DIR} - ) + ) execute_process( COMMAND sed -i "/#include /a #include " dullahan.h - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40/src - ) + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10/src + ) file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/cef) + if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64) + set(CEF_PLATFORM arm) + endif () try_compile(DULLAHAN_RESULT PROJECT dullahan - 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 + SOURCE_DIR ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10 + BINARY_DIR ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10 CMAKE_FLAGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${LIBS_PREBUILT_DIR} -DCMAKE_INSTALL_LIBDIR:PATH=${ARCH_PREBUILT_DIRS_RELEASE} -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON -DUSE_SPOTIFY_CEF:BOOL=ON - -DSPOTIFY_CEF_URL:STRING=https://cef-builds.spotifycdn.com/cef_binary_139.0.40%2Bg465474a%2Bchromium-139.0.7258.139_linuxarm64_minimal.tar.bz2 + -DSPOTIFY_CEF_URL:STRING=https://cef-builds.spotifycdn.com/cef_binary_147.0.10%2Bgd58e84d%2Bchromium-147.0.7727.118_linux${CEF_PLATFORM}64_minimal.tar.bz2 -DPROJECT_ARCH:STRING=${CMAKE_SYSTEM_PROCESSOR} ) if (${DULLAHAN_RESULT}) execute_process( COMMAND ${CMAKE_MAKE_PROGRAM} install - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.24.0-CEF_139.0.40 + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10 OUTPUT_VARIABLE dullahan_installed ) file( COPY - ${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 + ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10/src/dullahan.h + ${CMAKE_BINARY_DIR}/dullahan-1.30.0-CEF_147.0.10/src/dullahan_version.h DESTINATION ${LIBS_PREBUILT_DIR}/include/cef ) file(WRITE ${PREBUILD_TRACKING_DIR}/dullahan_installed "${dullahan_installed}") -- cgit v1.3