From d10e4cd040d53c2fdae2c0df24b3b1896d36b44c Mon Sep 17 00:00:00 2001 From: juvester Date: Fri, 30 Nov 2018 18:03:48 +0200 Subject: [PATCH] CI: Use VLC 3.0.4 instead of master for macOS Fixes an issue where macOS builds on Travis would fail due to changes in VLC master branch. --- CI/before-script-osx.sh | 2 +- CI/install-dependencies-osx.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/before-script-osx.sh b/CI/before-script-osx.sh index 7415b161b..41dff9fe0 100755 --- a/CI/before-script-osx.sh +++ b/CI/before-script-osx.sh @@ -9,7 +9,7 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \ -DQTDIR=/usr/local/Cellar/qt/5.10.1 \ -DDepsPath=/tmp/obsdeps \ --DVLCPath=$PWD/../../vlc-master \ +-DVLCPath=$PWD/../../vlc-3.0-3.0.4 \ -DBUILD_BROWSER=ON \ -DBROWSER_DEPLOY=ON \ -DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 .. diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 82f3aace9..c99167a5d 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -37,8 +37,8 @@ tar -xf ./osx-deps-2018-08-09.tar.gz -C /tmp # Fetch vlc codebase hr "Downloading VLC repo" -wget --quiet --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip -unzip -q ./vlc-master.zip +wget --quiet --retry-connrefused --waitretry=1 -O vlc-3.0-3.0.4.zip https://github.com/videolan/vlc-3.0/archive/3.0.4.zip +unzip -q ./vlc-3.0-3.0.4.zip # Get sparkle hr "Downloading Sparkle framework"