From 302d4860f3101b15b64a1aa042b40d80784f853f Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Mon, 25 Jun 2018 15:52:49 -0700 Subject: [PATCH] Travis: Attempt to fix --- .travis-deps.sh | 11 ++++++----- .travis.yml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis-deps.sh b/.travis-deps.sh index b249cefee..64e45cc98 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -1,16 +1,17 @@ #!/bin/sh if [ $TRAVIS_OS_NAME = "osx" ]; then brew update - brew install qt5 ffmpeg imagemagick sdl2 libzip libpng + brew install qt5 ffmpeg imagemagick sdl2 libedit libelf libpng libzip else sudo apt-get clean + sudo add-apt-repository -y ppa:beineri/opt-qt542-trusty sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get update - sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \ - libpng-dev libsdl2-dev libzip-dev qtbase5-dev \ - libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \ - libavutil-dev libavformat-dev libavresample-dev libswscale-dev + sudo apt-get install -y -q cmake libedit-dev libelf-dev libmagickwand-dev \ + libpng-dev libsdl2-dev libzip-dev qt54base qt54multimedia \ + libavcodec-dev libavutil-dev libavformat-dev libavresample-dev \ + libswscale-dev if [ "$CC" == "gcc" ]; then sudo apt-get install -y -q gcc-5 g++-5 export CC=gcc-5 diff --git a/.travis.yml b/.travis.yml index 3f3e6077c..17bcaca87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ matrix: before_install: - source ./.travis-deps.sh -script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 .. && make -j2 +script: mkdir build && cd build && cmake -DCMAKE_PREFIX_PATH='/usr/local/opt/qt5;/opt/qt54' .. && make -j2