feat: update cef to 131

CasparCG · Jan 9, 2025 · a9c075c · a9c075c
1 parent d28cb13
commit a9c075c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 51 deletions.
diff --git a/.github/workflows/linux-system.yml b/.github/workflows/linux-system.yml
@@ -37,7 +37,7 @@ jobs:
                     libswscale-dev \
                     libpostproc-dev \
                     libswresample-dev \
-                    casparcg-cef-117-dev
+                    casparcg-cef-131-dev
 
             - name: Run build
               run: |

diff --git a/src/CMakeModules/Bootstrap_Linux.cmake b/src/CMakeModules/Bootstrap_Linux.cmake
@@ -63,8 +63,8 @@ FIND_PACKAGE (X11 REQUIRED)
 
 if (ENABLE_HTML)
     if (USE_SYSTEM_CEF)
-        set(CEF_LIB_PATH "/usr/lib/casparcg-cef-117")
-        set(CEF_INCLUDE_PATH "/usr/include/casparcg-cef-117")
+        set(CEF_LIB_PATH "/usr/lib/casparcg-cef-131")
+        set(CEF_INCLUDE_PATH "/usr/include/casparcg-cef-131")
 
         set(CEF_LIB
             "-Wl,-rpath,${CEF_LIB_PATH} ${CEF_LIB_PATH}/libcef.so"
@@ -73,12 +73,11 @@ if (ENABLE_HTML)
     else()
         casparcg_add_external_project(cef)
         ExternalProject_Add(cef
-            URL ${CASPARCG_DOWNLOAD_MIRROR}/cef/cef_binary_117.2.5%2Bgda4c36a%2Bchromium-117.0.5938.152_linux64_minimal.tar.bz2
-            URL_HASH SHA1=7e6c9cf591cf3b1dabe65a7611f5fc166df2ec1e
+            URL https://cef-builds.spotifycdn.com/cef_binary_131.4.1%2Bg437feba%2Bchromium-131.0.6778.265_linux64_minimal.tar.bz2
+            URL_HASH SHA1=cbe52ac3c39ef93fdc5021588e12c466e801d9af
             DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
             CMAKE_ARGS -DUSE_SANDBOX=Off
             INSTALL_COMMAND ""
-            PATCH_COMMAND git apply ${CASPARCG_PATCH_DIR}/cef117.patch
             BUILD_BYPRODUCTS
                 "<SOURCE_DIR>/Release/libcef.so"
                 "<BINARY_DIR>/libcef_dll_wrapper/libcef_dll_wrapper.a"

diff --git a/src/CMakeModules/Bootstrap_Windows.cmake b/src/CMakeModules/Bootstrap_Windows.cmake
@@ -228,12 +228,11 @@ casparcg_add_runtime_dependency("${LIBERATION_FONTS_BIN_PATH}/LiberationMono-Reg
 if (ENABLE_HTML)
 	casparcg_add_external_project(cef)
 	ExternalProject_Add(cef
-		URL ${CASPARCG_DOWNLOAD_MIRROR}/cef/cef_binary_117.2.5%2Bgda4c36a%2Bchromium-117.0.5938.152_windows64_minimal.tar.bz2
-		URL_HASH MD5=cff21bce81bada2a9e5f0afbec0858f0
+		URL ${CASPARCG_DOWNLOAD_MIRROR}/cef/cef_binary_131.4.1%2Bg437feba%2Bchromium-131.0.6778.265_windows64_minimal.tar.bz2
+		URL_HASH SHA1=864d40fb6e26a6ac8cf1003cbfcc16d35c90782e
 		DOWNLOAD_DIR ${CASPARCG_DOWNLOAD_CACHE}
 		CMAKE_ARGS -DUSE_SANDBOX=Off -DCEF_RUNTIME_LIBRARY_FLAG=/MD
 		INSTALL_COMMAND ""
-		PATCH_COMMAND git apply ${CASPARCG_PATCH_DIR}/cef117.patch
 	)
 	ExternalProject_Get_Property(cef SOURCE_DIR)
 	ExternalProject_Get_Property(cef BINARY_DIR)

diff --git a/src/CMakeModules/patches/cef117.patch b/src/CMakeModules/patches/cef117.patch
diff --git a/src/modules/html/html.cpp b/src/modules/html/html.cpp
@@ -118,7 +118,7 @@ class renderer_application
 
         caspar_log(browser,
                    boost::log::trivial::trace,
-                   "context for frame " + std::to_string(frame->GetIdentifier()) + " created");
+                   "context for frame " + frame->GetIdentifier().ToString() + " created");
         contexts_.push_back(context);
 
         auto window = context->GetGlobal();
@@ -154,11 +154,11 @@ class renderer_application
         if (removed != contexts_.end()) {
             caspar_log(browser,
                        boost::log::trivial::trace,
-                       "context for frame " + std::to_string(frame->GetIdentifier()) + " released");
+                       "context for frame " + frame->GetIdentifier().ToString() + " released");
         } else {
             caspar_log(browser,
                        boost::log::trivial::warning,
-                       "context for frame " + std::to_string(frame->GetIdentifier()) + " released, but not found");
+                       "context for frame " + frame->GetIdentifier().ToString() + " released, but not found");
         }
     }
 

diff --git a/src/modules/html/producer/html_producer.cpp b/src/modules/html/producer/html_producer.cpp
@@ -215,6 +215,7 @@ class html_client
 
     bool OnBeforePopup(CefRefPtr<CefBrowser>          browser,
                        CefRefPtr<CefFrame>            frame,
+                       int                            popup_id,
                        const CefString&               target_url,
                        const CefString&               target_frame_name,
                        WindowOpenDisposition          target_disposition,