From d59c730f4f4e84ad22ce335ac60dd1a24f58a99c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 19 Jan 2020 23:08:48 +1100 Subject: [PATCH] update dependencies and path for linux/mac builds --- .travis/before_install.sh | 4 ++-- .travis/install.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis/before_install.sh b/.travis/before_install.sh index e7dee885f..20f9388dc 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -2,8 +2,8 @@ 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 + # Qt 5.11 + sudo add-apt-repository ppa:beineri/opt-qt-5.11.0-xenial -y # FFmpeg 4.x sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y diff --git a/.travis/install.sh b/.travis/install.sh index 7019f1e51..7dabf9f46 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -2,12 +2,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - #export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" - echo Attempting skip of Mac path export + export PATH="/usr/local/opt/qt/bin:/usr/local/opt/python@2/libexec/bin:$PATH" 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 + sudo apt-get -y -o Dpkg::Options::="--force-overwrite" install qt511base qt511multimedia qt511svg 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