update libcef (#551)

stream-labs · Nov 2, 2023 · 0fdbb25 · 0fdbb25
1 parent 91126a4
commit 0fdbb25
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/main-streamlabs.yml b/.github/workflows/main-streamlabs.yml
@@ -36,6 +36,7 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET_X86_64: '10.15'
       MACOSX_DEPLOYMENT_TARGET_ARM64: '11.0'
       CEF_BUILD_VERSION_MAC: '5060'
+      CEF_BUILD_REVISION_MAC: 'v4'
       DEPS_VERSION_MAC: '2022-08-02-b230301'
       QT_DEPS_VERSION_MAC: '2022-08-02'
       VLC_VERSION_MAC: '3.0.8'
@@ -117,6 +118,7 @@ jobs:
     env:
       OS_TAG: "windows64"
       CEF_VERSION: 5060
+      CEF_REVISION: v3
       WIN_DEPS_VERSION: windows-deps-2022-08-02-x64-sl.1
       GRPC_VERSION: v1.47.0
       CMakeGenerator: Visual Studio 17 2022

diff --git a/libobs/obs-source.c b/libobs/obs-source.c
@@ -399,7 +399,9 @@ obs_source_create_internal(const char *id, const char *name,
 			info->create(source->context.settings, source);
 		if (!source->context.data) {
 			// We cannot ignore the error because it causes crashes later.
-			blog(LOG_ERROR, "Failed to create data for the source '%s'!", name);
+			blog(LOG_ERROR,
+			     "Failed to create data for the source '%s'!",
+			     name);
 			goto fail;
 		}
 	}

diff --git a/slobs_CI/build_support_macos.sh b/slobs_CI/build_support_macos.sh
@@ -24,6 +24,7 @@ CI_QT_VERSION=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+QT_VERSION_
 CI_MACOSX_DEPLOYMENT_TARGET_X86_64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+MACOSX_DEPLOYMENT_TARGET_X86_64: '([0-9\.]+)'/\1/p")
 CI_MACOSX_DEPLOYMENT_TARGET_ARM64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+MACOSX_DEPLOYMENT_TARGET_ARM64: '([0-9\.]+)'/\1/p")
 CI_MACOS_CEF_VERSION=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+CEF_BUILD_VERSION_MAC: '([0-9]+)'/\1/p")
+CI_MACOS_CEF_REVISION=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+CEF_BUILD_REVISION_MAC: '([^']+)'/\1/p")
 CI_CEF_HASH_X86_64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+CEF_HASH_MAC_X86_64: '([0-9a-f]+)'/\1/p")
 CI_CEF_HASH_ARM64=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+CEF_HASH_MAC_ARM64: '([0-9a-f]+)'/\1/p")
 CI_BUILD_CONFIG=$(echo "${WORKFLOW_CONTENT}" | /usr/bin/sed -En "s/[ ]+BUILD_CONFIG: '([0-9a-f]+)'/\1/p")

diff --git a/slobs_CI/win-install-dependency.cmd b/slobs_CI/win-install-dependency.cmd
@@ -9,7 +9,7 @@ set VLCURL=https://obs-studio-deployment.s3-us-west-2.amazonaws.com/%VLC_VERSION
 set VLC_DIR=%CD%\%SUBDIR%\vlc
 
 set CEFURL=https://streamlabs-cef-dist.s3.us-west-2.amazonaws.com
-set CefFileName=cef_binary_%CEF_VERSION%_windows_x64
+set CefFileName=cef_binary_%CEF_VERSION%_windows_x64_%CEF_REVISION%
 set CEFPATH=%CD%\%SUBDIR%\%CefFileName%
 
 set OBS_VIRTUALCAM=obs-virtualsource_32bit