From 30d967eafa13fcf7179585017bf432ce9cda1ac2 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Fri, 13 Apr 2018 22:18:01 -0700
Subject: [PATCH] obs-browser: Update to browser source refactor

---
 CI/before-deploy-osx.sh           | 20 +++++++++++---------
 CI/before-script-osx.sh           |  6 +-----
 CI/install/osx/CMakeLists.pkgproj |  2 +-
 CI/install/osx/post-install.sh    |  4 ----
 plugins/obs-browser               |  2 +-
 5 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/CI/before-deploy-osx.sh b/CI/before-deploy-osx.sh
index f1a87f41c..c7290fe27 100755
--- a/CI/before-deploy-osx.sh
+++ b/CI/before-deploy-osx.sh
@@ -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"
diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh
index 24d1ff521..f7a251e4f 100755
--- a/CI/before-script-osx.sh
+++ b/CI/before-script-osx.sh
@@ -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 ..
\ No newline at end of file
+-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
diff --git a/CI/install/osx/CMakeLists.pkgproj b/CI/install/osx/CMakeLists.pkgproj
index eff607a0b..4d6d7293e 100644
--- a/CI/install/osx/CMakeLists.pkgproj
+++ b/CI/install/osx/CMakeLists.pkgproj
@@ -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>
diff --git a/CI/install/osx/post-install.sh b/CI/install/osx/post-install.sh
index f55ae58bb..f1f641af1 100644
--- a/CI/install/osx/post-install.sh
+++ b/CI/install/osx/post-install.sh
@@ -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"
diff --git a/plugins/obs-browser b/plugins/obs-browser
index 3521f18ed..461164037 160000
--- a/plugins/obs-browser
+++ b/plugins/obs-browser
@@ -1 +1 @@
-Subproject commit 3521f18ed3b6b4dd4805090702ec28605892bda0
+Subproject commit 46116403705b482eeccd0c2d1d2136c8a610747f