From 6b6b7feff29a33c046e879e2b9a92fd61e1e7f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20L?= <contact@slepin.fr>
Date: Sun, 6 Aug 2017 22:28:07 +0200
Subject: [PATCH] macOS CI: properly use Qt from Homebrew

---
 CI/build-osx.sh                |  4 ++--
 CI/install-dependencies-osx.sh |  7 ++++---
 CI/package-osx.sh              | 12 ++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CI/build-osx.sh b/CI/build-osx.sh
index 098ade18..0609f9cd 100755
--- a/CI/build-osx.sh
+++ b/CI/build-osx.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 set -ex
 
-export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
+#export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
 mkdir build && cd build
 cmake .. \
-  -DQTDIR="$QT_PREFIX" \
+  -DQTDIR=/usr/local/opt/qt \
   -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
   -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
   -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh
index f11ecb7f..dfc822d1 100755
--- a/CI/install-dependencies-osx.sh
+++ b/CI/install-dependencies-osx.sh
@@ -7,8 +7,9 @@ brew install ffmpeg
 brew install libav
 
 # qtwebsockets deps
-brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/fdb7c6e960e830b3bf630850c0002c5df9f68ed8/Formula/qt5.rb
-echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
+brew versions qt5
+brew install qt5
+#echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
 # Build obs-studio
 cd ..
@@ -17,7 +18,7 @@ cd obs-studio
 git checkout 19.0.3
 mkdir build && cd build
 cmake .. \
-  -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake \
+  -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
 && make -j4
 
 sudo make install
diff --git a/CI/package-osx.sh b/CI/package-osx.sh
index 4bd90754..80239590 100755
--- a/CI/package-osx.sh
+++ b/CI/package-osx.sh
@@ -3,7 +3,7 @@
 set -e
 
 echo "-- Preparing package build"
-export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
+#export QT_PREFIX="$(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
 export WS_LIB="$QT_PREFIX/lib/QtWebSockets.framework/QtWebSockets"
 export NET_LIB="$QT_PREFIX/lib/QtNetwork.framework/QtNetwork"
@@ -28,15 +28,15 @@ chmod +rw ./build/QtWebSockets ./build/QtNetwork
 
 echo "-- Modifying QtNetwork"
 install_name_tool \
-	-change /usr/local/opt/qt5/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
-	-change "$QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore" @rpath/QtCore \
+	-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
+	-change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
 	./build/QtNetwork
 
 echo "-- Modifying QtWebSockets"
 install_name_tool \
-	-change /usr/local/opt/qt5/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \
-	-change $QT_PREFIX/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
-	-change $QT_PREFIX/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
+	-change /usr/local/opt/qt/lib/QtWebSockets.framework/Versions/5/QtWebSockets @rpath/QtWebSockets \
+	-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork @rpath/QtNetwork \
+	-change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @rpath/QtCore \
 	./build/QtWebSockets
 
 echo "-- Modifying obs-websocket.so"