jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1560 from juvester/ci-osx-vlc-fix 

CI: Use VLC 3.0.4 instead of master for macOS
master
Colin Edwards 2018-11-30 11:05:22 -06:00 committed by GitHub
parent 01e8426981 d10e4cd040
commit 53f9544a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/before-script-osx.sh
View File

@ -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 ..

4
CI/install-dependencies-osx.sh
View File

@ -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"