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

CI: Fix build issues introduced by updates obs-deps

Browse Source
This commit is contained in:
PatTheMav 2021-12-19 15:36:05 +01:00 committed by Colin Edwards
parent 96ee97e997
commit 0072629ceb
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CI/full-build-macos.sh
View File

@ -170,18 +170,21 @@ install_obs-deps() {
hr "Setting up pre-built macOS OBS dependencies v${1}"
ensure_dir "${DEPS_BUILD_DIR}"
step "Download..."
${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-${CURRENT_ARCH}-${1}.tar.gz
${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${1}/macos-deps-${1}-${CURRENT_ARCH}.tar.xz
step "Unpack..."
/usr/bin/tar -xf "./macos-deps-${CURRENT_ARCH}-${1}.tar.gz" -C /tmp
mkdir -p /tmp/obsdeps
/usr/bin/tar -xf "./macos-deps-${1}-${CURRENT_ARCH}.tar.xz" -C /tmp/obsdeps
/usr/bin/xattr -r -d com.apple.quarantine /tmp/obsdeps
}
install_qt-deps() {
hr "Setting up pre-built dependency QT v${1}"
ensure_dir "${DEPS_BUILD_DIR}"
step "Download..."
${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${2}/macos-qt-${1}-${CURRENT_ARCH}-${2}.tar.gz
${CURLCMD} --progress-bar -L -C - -O https://github.com/obsproject/obs-deps/releases/download/${2}/macos-deps-qt-${2}-${CURRENT_ARCH}.tar.xz
step "Unpack..."
/usr/bin/tar -xf ./macos-qt-${1}-${CURRENT_ARCH}-${2}.tar.gz -C /tmp
mkdir -p /tmp/obsdeps
/usr/bin/tar -xf ./macos-deps-qt-${2}-${CURRENT_ARCH}.tar.xz -C /tmp/obsdeps
/usr/bin/xattr -r -d com.apple.quarantine /tmp/obsdeps
}
@ -332,17 +335,31 @@ bundle_dylibs() {
./OBS.app/Contents/PlugIns/aja.so
./OBS.app/Contents/PlugIns/aja-output-ui.so
)
SEARCH_PATHS=(
/tmp/obsdeps/lib
/tmp/obsdeps/lib/QtSvg.framework
/tmp/obsdeps/lib/QtXml.framework
/tmp/obsdeps/lib/QtNetwork.framework
/tmp/obsdeps/lib/QtCore.framework
/tmp/obsdeps/lib/QtGui.framework
/tmp/obsdeps/lib/QtWidgets.framework
/tmp/obsdeps/lib/QtDBus.framework
/tmp/obsdeps/lib/QtPrintSupport.framework
)
if ! [ "${MACOS_CEF_BUILD_VERSION:-${CI_MACOS_CEF_VERSION}}" -le 3770 ]; then
"${CI_SCRIPTS}/app/dylibbundler" -cd -of -a ./OBS.app -q -f \
-s ./OBS.app/Contents/MacOS \
-s "${DEPS_BUILD_DIR}/sparkle/Sparkle.framework" \
-s ./rundir/${BUILD_CONFIG}/bin/ \
$(echo "${SEARCH_PATHS[@]/#/-s }") \
$(echo "${BUNDLE_PLUGINS[@]/#/-x }")
else
"${CI_SCRIPTS}/app/dylibbundler" -cd -of -a ./OBS.app -q -f \
-s ./OBS.app/Contents/MacOS \
-s "${DEPS_BUILD_DIR}/sparkle/Sparkle.framework" \
-s ./rundir/${BUILD_CONFIG}/bin/ \
$(echo "${SEARCH_PATHS[@]/#/-s }") \
$(echo "${BUNDLE_PLUGINS[@]/#/-x }") \
-x ./OBS.app/Contents/PlugIns/obs-browser-page
fi