Merge pull request #2065 from DDRBoxman/cefupdate

CI: Update CEF on osx to 3770

.travis.yml

@@ -23,7 +23,7 @@ matrix:
       osx_image: xcode9.4
       env:
        - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake
-       - CEF_BUILD_VERSION=3.3282.1726.gc8368c8
+       - CEF_BUILD_VERSION=3770
       before_install: "./CI/install-dependencies-osx.sh"
       before_script: "./CI/before-script-osx.sh"
       before_deploy: "./CI/before-deploy-osx.sh"

CI/before-deploy-osx.sh

@@ -40,10 +40,18 @@ sudo install_name_tool -change \
 	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
 	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
 	OBS.app/Contents/Resources/obs-plugins/obs-browser.so
+sudo install_name_tool -change \
+	@executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	OBS.app/Contents/Resources/obs-plugins/obs-browser.so	
 sudo install_name_tool -change \
 	@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
 	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
 	OBS.app/Contents/Resources/obs-plugins/obs-browser-page
+sudo install_name_tool -change \
+	@executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
+	OBS.app/Contents/Resources/obs-plugins/obs-browser-page
 
 # Package app
 hr "Generating .pkg"

CI/install-dependencies-osx.sh

@@ -12,6 +12,8 @@ set -v
 
 if [[ $TRAVIS ]]; then
   git fetch --unshallow
+else
+  /bin/bash -c "sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer"
 fi
 
 # Leave obs-studio folder

azure-pipelines.yml

@@ -2,7 +2,7 @@
 
 variables:
   CMAKE_PREFIX_PATH: /usr/local/opt/qt5/lib/cmake
-  CEF_BUILD_VERSION: 3.3282.1726.gc8368c8 
+  CEF_BUILD_VERSION: 3770
   CEF_VERSION: 75.1.16+g16a67c4+chromium-75.0.3770.100
   TWITCH-CLIENTID: $(twitch_clientid)
   TWITCH-HASH: $(twitch_hash)