mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code

Merge pull request #2065 from DDRBoxman/cefupdate

Browse Source 
CI: Update CEF on osx to 3770
This commit is contained in:
Colin Edwards 2019-09-07 18:22:03 -05:00 committed by GitHub
commit 977f0397ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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"

8
CI/before-deploy-osx.sh
View File

@ -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"

2
CI/install-dependencies-osx.sh
View File

@ -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

2
azure-pipelines.yml
View File

@ -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)