From 0072629ceb6e0d6c5a49fcbaff4b418ac709fff0 Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Sun, 19 Dec 2021 15:36:05 +0100
Subject: [PATCH] CI: Fix build issues introduced by updates obs-deps

---
 CI/full-build-macos.sh | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh
index b4ddd5daf..96cb9b1fb 100755
--- a/CI/full-build-macos.sh
+++ b/CI/full-build-macos.sh
@@ -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