From 840b41256a98a3982e370c67f50ab4a91e9bf81b Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 26 Jan 2020 12:01:53 +1100 Subject: [PATCH] travis: use native xenial OIIO package rather than PPA Now that we support OIIO 1.x, we don't need to use a PPA to install OIIO 2.x on Xenial. The advantage of this is: 1. Not having to maintain an OIIO PPA. 2. Not messing up anyone's system if they have software installed that's been linked with OIIO 1.x and then are forced to install over it with OIIO 2.x. --- .travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/install.sh b/.travis/install.sh index e53f1bf04..fa29d2ef8 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -6,7 +6,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio2-dev libgl1-mesa-dev + sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg qt511tools libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev libgl1-mesa-dev source /opt/qt*/bin/qt*-env.sh fi