diff --git a/.travis/before_install.sh b/.travis/before_install.sh index 3033c362f..9eeea5ee8 100644 --- a/.travis/before_install.sh +++ b/.travis/before_install.sh @@ -2,8 +2,8 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - # Qt 5.9.3 - FIXME: Consider finding newer version - sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y + # 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 diff --git a/.travis/install.sh b/.travis/install.sh index 18db860ee..3993de05a 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 install qt59base qt59multimedia qt59svg libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev cmake libopencolorio-dev libopenimageio-dev + sudo apt-get -y install qt510base qt510multimedia qt510svg 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 diff --git a/appveyor-build.bat b/appveyor-build.bat index 107124287..7ab9e755c 100644 --- a/appveyor-build.bat +++ b/appveyor-build.bat @@ -4,7 +4,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_ REM Install FFmpeg curl -L -o ffmpeg-4.2-win64-shared.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-shared.zip -curl -L -o ffmpeg-4.2-win64-dev.zip https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2-win64-dev.zip +curl -L -o ffmpeg-4.2-win64-dev.zip https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2-win64-dev.zip 7z x ffmpeg-4.2-win64-shared.zip 7z x ffmpeg-4.2-win64-dev.zip @@ -17,7 +17,7 @@ curl -L -o oiio-v2.3.0-win64-shared.zip https://github.com/olive-editor/OpenImag 7z x oiio-v2.3.0-win64-shared.zip REM Run cmake -cmake . -G "NMake Makefiles" -DOPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared -DFFMPEG_ROOT=ffmpeg-4.2-win64-dev -DOIIO_BASE_DIR=oiio-v2.3.0-win64-shared -DQt5_DIR=C:\Qt\5.13.0\msvc2015_64 +cmake . -G "NMake Makefiles" -DOPENCOLORIO_ROOT_DIR=ocio-v1.1.1-win64-shared -DFFMPEG_ROOT=ffmpeg-4.2-win64-dev -DOIIO_BASE_DIR=oiio-v2.3.0-win64-shared -DQt5_DIR=C:\Qt\5.13.0\msvc2015_64\lib\cmake\Qt5 REM Build Olive nmake