From 43f9f45f8f88b89611ac8c3d0c2e93f8ba8755e8 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 11 Dec 2019 17:32:04 -0600 Subject: [PATCH 1/3] CI: Fix framework symlinks when building osx app --- CI/before-deploy-osx.sh | 4 ++-- CI/install/osx/packageApp.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/before-deploy-osx.sh b/CI/before-deploy-osx.sh index 7c092c420..1ee8bfbab 100755 --- a/CI/before-deploy-osx.sh +++ b/CI/before-deploy-osx.sh @@ -49,13 +49,13 @@ install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/l # copy sparkle into the app hr "Copying Sparkle.framework" -cp -r ../../sparkle/Sparkle.framework ./OBS.app/Contents/Frameworks/ +cp -R ../../sparkle/Sparkle.framework ./OBS.app/Contents/Frameworks/ install_name_tool -change @rpath/Sparkle.framework/Versions/A/Sparkle @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle ./OBS.app/Contents/MacOS/obs # Copy Chromium embedded framework to app Frameworks directory hr "Copying Chromium Embedded Framework.framework" sudo mkdir -p OBS.app/Contents/Frameworks -sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/ +sudo cp -R ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/ install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/obs-browser.so install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/obs-browser.so diff --git a/CI/install/osx/packageApp.sh b/CI/install/osx/packageApp.sh index e3175b995..477e93b07 100755 --- a/CI/install/osx/packageApp.sh +++ b/CI/install/osx/packageApp.sh @@ -46,7 +46,7 @@ cp ../CI/install/osx/Info.plist ./OBS.app/Contents mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks # put qt network in here becasuse streamdeck uses it -cp -r /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks +cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks chmod +w ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork install_name_tool -change /usr/local/Cellar/qt/5.10.1/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork From effcdc04d2a1d296c2e35daeac3d5b73ec90f086 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 11 Dec 2019 18:25:54 -0600 Subject: [PATCH 2/3] CI: Fix osx executable path in plist --- CI/install/osx/Info.plist | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CI/install/osx/Info.plist b/CI/install/osx/Info.plist index 7eed962ad..074e14aed 100644 --- a/CI/install/osx/Info.plist +++ b/CI/install/osx/Info.plist @@ -9,13 +9,11 @@ CFBundleGetInfoString OBS - Free and Open Source Streaming/Recording Software CFBundleExecutable - OBS + obs CFBundleIdentifier com.obsproject.obs-studio CFBundlePackageType APPL - CFBundleSignature - ???? LSMinimumSystemVersion 10.8.5 NSHighResolutionCapable From 6096d236325272bb60497b72e390391fa59a85e3 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 11 Dec 2019 23:04:51 -0600 Subject: [PATCH 3/3] CI: Fix up QT network framework on OSX --- CI/install/osx/packageApp.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CI/install/osx/packageApp.sh b/CI/install/osx/packageApp.sh index 477e93b07..ca759e5e1 100755 --- a/CI/install/osx/packageApp.sh +++ b/CI/install/osx/packageApp.sh @@ -48,8 +48,13 @@ mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks # put qt network in here becasuse streamdeck uses it cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks chmod +w ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork +rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers +rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/QtNetwork.prl +rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/ +chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist install_name_tool -change /usr/local/Cellar/qt/5.10.1/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork + # decklink ui qt install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/decklink-ouput-ui.so install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/decklink-ouput-ui.so