From a460e359f33feb54a42f08e74ac4a511220e7b6f Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Sat, 14 May 2016 21:49:32 +0200
Subject: [PATCH] Use the Trusty beta build environment

---
 .travis.yml                           |  2 ++
 .travis/linux..before_install.sh      | 12 ++++++------
 .travis/linux..install.sh             |  3 +++
 .travis/linux.win32.before_install.sh |  2 +-
 .travis/linux.win32.install.sh        |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9ae7ddff3..9755b28f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 language: cpp
 compiler: gcc
+dist: trusty
+sudo: required
 matrix:
     include:
         - env: TARGET_OS=win32
diff --git a/.travis/linux..before_install.sh b/.travis/linux..before_install.sh
index 8a64d814c..f5e3b435c 100644
--- a/.travis/linux..before_install.sh
+++ b/.travis/linux..before_install.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-sudo add-apt-repository ppa:kalakris/cmake -y;
-sudo add-apt-repository ppa:andrewrk/libgroove -y;
-if [ $QT5 ]; then
-	sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y
-fi
-sudo apt-get update -qq
+sudo add-apt-repository ppa:andrewrk/libgroove -y
+sudo sed -e "s/trusty/precise/" -i \
+	/etc/apt/sources.list.d/andrewrk-libgroove-trusty.list
+
+sudo dpkg --add-architecture i386
+sudo apt-get update -qq || true
diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh
index dc27c5c17..7b591feb9 100644
--- a/.travis/linux..install.sh
+++ b/.travis/linux..install.sh
@@ -5,6 +5,9 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev  libogg-dev
 	libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev
 	libgig-dev libsoundio-dev"
 
+# Help with unmet dependencies
+PACKAGES="$PACKAGES libjack0"
+
 if [ $QT5 ]; then
 	PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev"
 else
diff --git a/.travis/linux.win32.before_install.sh b/.travis/linux.win32.before_install.sh
index 5ee747fa1..c7550f045 100644
--- a/.travis/linux.win32.before_install.sh
+++ b/.travis/linux.win32.before_install.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-sudo add-apt-repository ppa:tobydox/mingw-x-precise -y
+sudo add-apt-repository ppa:tobydox/mingw-x-trusty -y
 sudo apt-get update -qq
diff --git a/.travis/linux.win32.install.sh b/.travis/linux.win32.install.sh
index fa910787a..95c4ccd57 100644
--- a/.travis/linux.win32.install.sh
+++ b/.travis/linux.win32.install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKAGES="nsis cloog-isl libmpc2 qt4-linguist-tools mingw32
+PACKAGES="nsis cloog-isl libmpc3 qt4-linguist-tools mingw32
 	mingw32-x-sdl mingw32-x-libvorbis mingw32-x-fluidsynth mingw32-x-stk
 	mingw32-x-glib2 mingw32-x-portaudio mingw32-x-libsndfile mingw32-x-fftw
 	mingw32-x-flac mingw32-x-fltk mingw32-x-libsamplerate