From d48560af0ad3ac496dc9d0d658919040123c0b67 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sat, 24 Feb 2024 20:44:38 +0100 Subject: [PATCH] CMake: Update cef, download minimal distribution The full distribution has the debug library, that is not used. --- .../cef_update_version_info.cmake | 5 +++-- .../webview_chromium/cef_version_info.cmake | 18 +++++++++--------- .../webview_chromium/cef_version_info.cmake.in | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/build/cmake/lib/webview_chromium/cef_update_version_info.cmake b/build/cmake/lib/webview_chromium/cef_update_version_info.cmake index 792b184f82..135c5d1da0 100644 --- a/build/cmake/lib/webview_chromium/cef_update_version_info.cmake +++ b/build/cmake/lib/webview_chromium/cef_update_version_info.cmake @@ -10,18 +10,19 @@ # Use this script to automatically update cef_version_info.cmake # # Run this script with cmake script mode -# cmake -D CEF_VERSION=3.x.y.z.h -P cef_update_version_info.cmake +# cmake -D CEF_VERSION=x.y.z+b -P cef_update_version_info.cmake if(NOT DEFINED CEF_VERSION) message(FATAL_ERROR "CEF_VERSION not defined") endif() set(CEF_BASE_URL "https://cef-builds.spotifycdn.com/cef_binary_") +set(CEF_DISTRIBUTION "_minimal") set(CEF_FILE_EXT ".tar.bz2") set(sha_file ${CMAKE_BINARY_DIR}/__info_sha.txt) foreach(platform windows64 windowsarm64 windows32 macosx64 macosarm64 linux64 linuxarm64 linuxarm) - file(DOWNLOAD "${CEF_BASE_URL}${CEF_VERSION}_${platform}${CEF_FILE_EXT}.sha1" "${sha_file}") + file(DOWNLOAD "${CEF_BASE_URL}${CEF_VERSION}_${platform}${CEF_DISTRIBUTION}${CEF_FILE_EXT}.sha1" "${sha_file}") file(READ "${sha_file}" CEF_SHA1_${platform}) endforeach() diff --git a/build/cmake/lib/webview_chromium/cef_version_info.cmake b/build/cmake/lib/webview_chromium/cef_version_info.cmake index 6139575bb1..b76b632617 100644 --- a/build/cmake/lib/webview_chromium/cef_version_info.cmake +++ b/build/cmake/lib/webview_chromium/cef_version_info.cmake @@ -18,27 +18,27 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") else() if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") set(CEF_PLATFORM "macosarm64") - set(CEF_SHA1 "289ba3c54d801f757ef527f581ce49bd135c37d6") + set(CEF_SHA1 "ea0807407c6d9dc1bb58cc0d4c67e9c3a1208e93") else() set(CEF_PLATFORM "macosx64") - set(CEF_SHA1 "d52703aa67772ef8cbb9d1a264a454f930df795b") + set(CEF_SHA1 "91fbc0347bacaadb20816c0b14a5a2c06c5a58f6") endif() endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SIZEOF_VOID_P LESS 8) if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm") set(CEF_PLATFORM "linuxarm") - set(CEF_SHA1 "4173bc576d34258e7de8624b216c36bfd5b7cbf0") + set(CEF_SHA1 "267658ad627828a8482f69600f7f295190902124") else() message(ERROR "Unsupported Linux system") endif() else() if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") set(CEF_PLATFORM "linuxarm64") - set(CEF_SHA1 "1a375eeb5d5c8a6df2e5911d5f6cfa25719ec140") + set(CEF_SHA1 "6457fc5dd3a847728f7b36f19a8d7291a3c5295d") else() set(CEF_PLATFORM "linux64") - set(CEF_SHA1 "a6b4166a5622a650165fa09c553ddaa9ade2338b") + set(CEF_SHA1 "e41bb03c6cd04d23e6a562b7783ec1da8eaa666c") endif() endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") @@ -47,18 +47,18 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") message(ERROR "Unsupported Windows system") else() set(CEF_PLATFORM "windows32") - set(CEF_SHA1 "f7a9f407108eeefc1469b0b51ada59c38b135de9") + set(CEF_SHA1 "28ba21dfc7eb68764c8a658ab7d0b6904122ab33") endif() else() if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64") set(CEF_PLATFORM "windowsarm64") - set(CEF_SHA1 "0a6286fafdf30f560bfff6a9bd6604ddaa9ff433") + set(CEF_SHA1 "34e99674098383de12b67bb9242f64c9d10633ed") else() set(CEF_PLATFORM "windows64") - set(CEF_SHA1 "5053b25559fbb310d0858e21fd81a2067e7b79b6") + set(CEF_SHA1 "f44288f1bb32ae88e3384874970352048267d9af") endif() endif() else() message(ERROR "Unsupported CEF system") endif() -set(CEF_URL "https://cef-builds.spotifycdn.com/cef_binary_119.4.7+g55e15c8+chromium-119.0.6045.199_${CEF_PLATFORM}.tar.bz2") +set(CEF_URL "https://cef-builds.spotifycdn.com/cef_binary_121.3.13+g5c4a81b+chromium-121.0.6167.184_${CEF_PLATFORM}${CEF_DISTRIBUTION}.tar.bz2") diff --git a/build/cmake/lib/webview_chromium/cef_version_info.cmake.in b/build/cmake/lib/webview_chromium/cef_version_info.cmake.in index 7877725302..a79440c99b 100644 --- a/build/cmake/lib/webview_chromium/cef_version_info.cmake.in +++ b/build/cmake/lib/webview_chromium/cef_version_info.cmake.in @@ -61,4 +61,4 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") else() message(ERROR "Unsupported CEF system") endif() -set(CEF_URL "@CEF_BASE_URL@@CEF_VERSION@_${CEF_PLATFORM}@CEF_FILE_EXT@") +set(CEF_URL "@CEF_BASE_URL@@CEF_VERSION@_${CEF_PLATFORM}${CEF_DISTRIBUTION}@CEF_FILE_EXT@")