From 22e2a1243217287495149d6fd9e3ab7dcaf0fc95 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Sun, 22 Jan 2017 00:49:01 -0600 Subject: [PATCH] CI: Build VLC plugin for OSX on travis --- CI/before-script-osx.sh | 2 +- CI/install-dependencies-osx.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index c5eb53d32..73366d6fe 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -1,3 +1,3 @@ mkdir build cd build -cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 .. \ No newline at end of file +cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 .. \ No newline at end of file diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index cb201d684..3b5843bc4 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -1,3 +1,6 @@ +# Leave obs-studio folder +cd ../ + curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg sudo installer -pkg ./Packages.pkg -target / @@ -9,8 +12,10 @@ brew install qt5 curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz tar -xf ./osx-deps.tar.gz -C /tmp +curl https://github.com/videolan/vlc/archive/master.zip +unzip ./vlc-master.zip + # CEF Stuff -cd ../ curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2 tar -xf ./cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2 cd ./cef_binary_3.2883.1540.gedbfb20_macosx64