From 7ef6c2c38d70f93af22302c2a8c506fe7c1e0035 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 15 Dec 2015 22:54:51 -0800
Subject: [PATCH] All: Travis trusty upgrade attempt 1

---
 .travis-deps.sh | 7 +------
 .travis.yml     | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/.travis-deps.sh b/.travis-deps.sh
index 0a249f533..d537a1a27 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -3,17 +3,12 @@ if [ $TRAVIS_OS_NAME = "osx" ]; then
 	brew update
 	brew install qt5 ffmpeg imagemagick sdl2 libzip libpng
 else
-	sudo add-apt-repository ppa:smspillaz/cmake-2.8.12 -y
-	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 \
-		g++-4.8 libpng-dev libsdl2-dev libzip-dev qtbase5-dev \
+		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
diff --git a/.travis.yml b/.travis.yml
index 35a8096f4..611cc4881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ os:
   - osx
 
 env:
-  - CMAKE_PREFIX_PATH=/usr/local/opt/qt5
+  - CMAKE_PREFIX_PATH=/usr/local/opt/qt4
 
 language: c
 compiler:
@@ -11,6 +11,7 @@ compiler:
   - clang
 
 sudo: required
+dist: trusty
 
 before_install:
   - ./.travis-deps.sh