Merge pull request #1560 from juvester/ci-osx-vlc-fix
CI: Use VLC 3.0.4 instead of master for macOSmaster
commit
53f9544a95
|
@ -9,7 +9,7 @@ cmake -DENABLE_SPARKLE_UPDATER=ON \
|
||||||
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
|
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
|
||||||
-DQTDIR=/usr/local/Cellar/qt/5.10.1 \
|
-DQTDIR=/usr/local/Cellar/qt/5.10.1 \
|
||||||
-DDepsPath=/tmp/obsdeps \
|
-DDepsPath=/tmp/obsdeps \
|
||||||
-DVLCPath=$PWD/../../vlc-master \
|
-DVLCPath=$PWD/../../vlc-3.0-3.0.4 \
|
||||||
-DBUILD_BROWSER=ON \
|
-DBUILD_BROWSER=ON \
|
||||||
-DBROWSER_DEPLOY=ON \
|
-DBROWSER_DEPLOY=ON \
|
||||||
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
|
-DCEF_ROOT_DIR=$PWD/../../cef_binary_${CEF_BUILD_VERSION}_macosx64 ..
|
||||||
|
|
|
@ -37,8 +37,8 @@ tar -xf ./osx-deps-2018-08-09.tar.gz -C /tmp
|
||||||
|
|
||||||
# Fetch vlc codebase
|
# Fetch vlc codebase
|
||||||
hr "Downloading VLC repo"
|
hr "Downloading VLC repo"
|
||||||
wget --quiet --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/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-master.zip
|
unzip -q ./vlc-3.0-3.0.4.zip
|
||||||
|
|
||||||
# Get sparkle
|
# Get sparkle
|
||||||
hr "Downloading Sparkle framework"
|
hr "Downloading Sparkle framework"
|
||||||
|
|
Loading…
Reference in New Issue