From a58458b9438354970adb306d79caa53735c90807 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Mon, 21 Sep 2015 01:06:11 -0700 Subject: [PATCH] All: Travis attempt 5 --- .travis-deps.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis-deps.sh b/.travis-deps.sh index 84e2032af..98cf3df85 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -6,10 +6,13 @@ else sudo add-apt-repository ppa:zoogie/sdl2-snapshots -y sudo add-apt-repository ppa:immerrr-k/qt5-backport -y sudo add-apt-repository ppa:spvkgn/ffmpeg+mpv -y + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get update -qq sudo apt-get purge cmake -qq sudo apt-get install -y -qq cmake libedit-dev libmagickwand-dev \ - libpng-dev libsdl2-dev libzip-dev qtbase5-dev \ + g++-4.8 libpng-dev libsdl2-dev libzip-dev qtbase5-dev \ libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \ libavutil-dev libavformat-dev libavresample-dev libswscale-dev + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100 fi