travis: update linux dep install code
This commit is contained in:
@@ -5,13 +5,15 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
# Qt 5.10.1 (may have to source newer version at some point)
|
||||
sudo add-apt-repository ppa:beineri/opt-qt-5.10.1-trusty -y
|
||||
|
||||
# FFmpeg 4.x (uses libs from 3.x repo)
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
|
||||
# FFmpeg 4.x
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y
|
||||
|
||||
# OpenImageIO
|
||||
sudo add-apt-repository ppa:olive-editor/openimageio -y
|
||||
|
||||
# OpenColorIO
|
||||
sudo add-apt-repository ppa:olive-editor/opencolorio -y
|
||||
|
||||
# Update apt
|
||||
sudo apt-get update -qq
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
|
||||
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt510base qt510multimedia qt510svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libopenexr-dev
|
||||
sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt510base qt510multimedia qt510svg qttools5-dev libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev
|
||||
source /opt/qt*/bin/qt*-env.sh
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user