Merge pull request #141 from PicoCentauri/master

macOS CI: Updated dependencies and namespaces

.travis.yml

@@ -35,10 +35,10 @@ matrix:
   - os: osx
     env: _macos_build
     osx_image: xcode8.3
-    before_install: "./CI/install-dependencies-osx.sh"
-    script: "./CI/build-osx.sh"
+    before_install: "./CI/install-dependencies-macos.sh"
+    script: "./CI/build-macos.sh"
     after_success: 
-    - ./CI/package-osx.sh
+    - ./CI/package-macos.sh
 
 deploy:
 - provider: s3

CI/build-macos.sh

@@ -7,6 +7,7 @@ mkdir build && cd build
 cmake .. \
   -DQTDIR=/usr/local/opt/qt \
   -DLIBOBS_INCLUDE_DIR=../../obs-studio/libobs \
+  -DLIBOBS_LIB=../../obs-studio/libobs \
   -DOBS_FRONTEND_LIB="$(pwd)/../../obs-studio/build/UI/obs-frontend-api/libobs-frontend-api.dylib" \
   -DCMAKE_INSTALL_PREFIX=/usr \
 && make -j4

CI/install-dependencies-macos.sh

@@ -7,22 +7,26 @@ brew install ffmpeg
 brew install libav
 
 # qtwebsockets deps
-brew install qt5
+# qt latest
+#brew install qt5
+
+# qt 5.9.2
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/2b121c9a96e58a5da14228630cb71d5bead7137e/Formula/qt.rb
+
 #echo "Qt path: $(find /usr/local/Cellar/qt5 -d 1 | tail -n 1)"
 
 # Build obs-studio
 cd ..
 git clone --recursive https://github.com/jp9000/obs-studio
 cd obs-studio
-git checkout 19.0.3
+git checkout 20.1.0
 mkdir build && cd build
 cmake .. \
   -DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake \
 && make -j4
 
-sudo make install
-
 # Packages app
 cd ..
-curl -L -O https://www.slepin.fr/obs-websocket/ci/Packages.pkg -f --retry 5 -C -
-sudo installer -pkg ./Packages.pkg -target /
+curl -L -O  http://s.sudre.free.fr/Software/files/Packages.dmg -f --retry 5 -C -
+hdiutil attach ./Packages.dmg
+sudo installer -pkg /Volumes/Packages\ 1.2/packages/Packages.pkg -target /

CI/package-macos.sh

@@ -59,7 +59,7 @@ otool -L ./build/obs-websocket.so
 chmod -w ./build/QtWebSockets ./build/QtNetwork
 
 echo "-- Actual package build"
-packagesbuild ./CI/osx/obs-websocket.pkgproj
+packagesbuild ./CI/macos/obs-websocket.pkgproj
 
 echo "-- Renaming obs-websocket.pkg to $FILENAME"
 mv ./release/obs-websocket.pkg ./release/$FILENAME