From f0fe107515c17b69259e6d3b39f9ff43ab286a97 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 4 Mar 2020 19:21:28 -0600 Subject: [PATCH] CI: macOS use qt 5.14.1 --- CI/before-script-osx.sh | 2 +- CI/install-dependencies-osx.sh | 2 +- CI/install/osx/packageApp.sh | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index 331259ae..902bc3b1 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -12,7 +12,7 @@ mkdir build cd build cmake -DENABLE_SPARKLE_UPDATER=ON \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \ --DQTDIR=/usr/local/Cellar/qt/5.10.1 \ +-DQTDIR=/usr/local/Cellar/qt/5.14.1 \ -DDepsPath=/tmp/obsdeps \ -DVLCPath=$PWD/../../vlc-3.0.4 \ -DBUILD_BROWSER=ON \ diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index de7b4273..4fd57351 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -29,7 +29,7 @@ brew update #Base OBS Deps and ccache brew install jack speexdsp ccache mbedtls clang-format freetype fdk-aac -brew install https://gist.githubusercontent.com/DDRBoxman/b3956fab6073335a4bf151db0dcbd4ad/raw/ed1342a8a86793ea8c10d8b4d712a654da121ace/qt.rb +brew install https://gist.githubusercontent.com/DDRBoxman/9c7a2b08933166f4b61ed9a44b242609/raw/ef4de6c587c6bd7f50210eccd5bd51ff08e6de13/qt.rb brew unlink swig brew install https://gist.githubusercontent.com/DDRBoxman/4cada55c51803a2f963fa40ce55c9d3e/raw/572c67e908bfbc1bcb8c476ea77ea3935133f5b5/swig.rb diff --git a/CI/install/osx/packageApp.sh b/CI/install/osx/packageApp.sh index 82110711..3e9c9412 100755 --- a/CI/install/osx/packageApp.sh +++ b/CI/install/osx/packageApp.sh @@ -1,3 +1,6 @@ +# Exit if something fails +set -e + rm -rf ./OBS.app mkdir OBS.app @@ -41,19 +44,20 @@ cp ../CI/install/osx/Info.plist ./OBS.app/Contents -x ./OBS.app/Contents/PlugIns/obs-libfdk.so # -x ./OBS.app/Contents/PlugIns/obs-outputs.so \ -/usr/local/Cellar/qt/5.10.1/bin/macdeployqt ./OBS.app +/usr/local/Cellar/qt/5.14.1/bin/macdeployqt ./OBS.app mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks +rm -f -r ./OBS.app/Contents/Frameworks/QtNetwork.framework + # put qt network in here becasuse streamdeck uses it cp -R /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework 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 -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./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 +install_name_tool -change /usr/local/Cellar/qt/5.14.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 -- GitLab