From 8f4910a7c8190c1675fd2434e85b01e6f3de86e3 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 19 Jan 2020 22:20:30 +1100 Subject: [PATCH] travis: update linux dep install code --- .travis/before_install.sh | 6 ++++-- .travis/install.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 9eeea5ee8..e7dee885f 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -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 diff --git a/.travis/install.sh b/.travis/install.sh index b9924bffd..7019f1e51 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -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