Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update cef to 131 #1594

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −51
Open

feat: update cef to 131 #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux-system.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
libswscale-dev \
libpostproc-dev \
libswresample-dev \
casparcg-cef-117-dev
casparcg-cef-131-dev
- name: Run build
run: |
Expand Down
9 changes: 4 additions & 5 deletions src/CMakeModules/Bootstrap_Linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 ${CASPARCG_DOWNLOAD_MIRROR}/cef/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"
Expand Down
5 changes: 2 additions & 3 deletions src/CMakeModules/Bootstrap_Windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
39 changes: 0 additions & 39 deletions src/CMakeModules/patches/cef117.patch
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/modules/html/html.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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");
}
}

Expand Down
1 change: 1 addition & 0 deletions src/modules/html/producer/html_producer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading