jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

obs-browser: Update to browser source refactor

Browse Source
This commit is contained in:
jp9000 2018-04-13 22:18:01 -07:00
parent 89a5235ac0
commit 30d967eafa
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,11 +14,6 @@ export FILENAME=$FILE_DATE-$GIT_HASH-$TRAVIS_BRANCH-osx.pkg
cd ./build
# Move the CEF plugin out before running build_app so that it doesn't get packaged twice
hr "Moving CEF out to preserve linking"
mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./
mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./
# Move obslua
hr "Moving OBS LUA"
mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/
@ -37,10 +32,17 @@ fi
sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --base-url "https://obsproject.com/osx_update" --stable=$STABLE
# Move the CEF plugin back to where it belongs
hr "Moving CEF back"
mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/
mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/
# Copy Chromium embedded framework to app Frameworks directory
hr "Copying Chromium Embedded Framework.framework"
sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks
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 \
@rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \
OBS.app/Contents/Resources/obs-plugins/cef-bootstrap
# Package app
hr "Generating .pkg"

6
CI/before-script-osx.sh
View File

@ -1,10 +1,6 @@
# Make sure ccache is found
export PATH=/usr/local/opt/ccache/libexec:$PATH
cd ./plugins/obs-browser
git checkout origin/osx
cd -
mkdir build
cd build
cmake -DENABLE_SPARKLE_UPDATER=ON \
@ -12,4 +8,4 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
-DDepsPath=/tmp/obsdeps \
-DVLCPath=$PWD/../../vlc-master \
-DBUILD_BROWSER=ON \
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..

2
CI/install/osx/CMakeLists.pkgproj
View File

@ -86,7 +86,7 @@
<key>GID</key>
<integer>80</integer>
<key>PATH</key>
<string>../../../build/plugins/obs-browser/CEF.app</string>
<string>../../../build/plugins/obs-browser/cef-bootstrap</string>
<key>PATH_TYPE</key>
<integer>3</integer>
<key>PERMISSIONS</key>

4
CI/install/osx/post-install.sh
View File

@ -1,5 +1 @@
#!/usr/bin/env bash
# Fix permissions on CEF
chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Info.plist"
chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Frameworks/CEF Helper.app/Contents/Info.plist"

2
plugins/obs-browser

@ -1 +1 @@
Subproject commit 3521f18ed3b6b4dd4805090702ec28605892bda0
Subproject commit 46116403705b482eeccd0c2d1d2136c8a610747f