Merge pull request #2780 from jasp00/travis

Use the Trusty beta build environment

.travis.yml

@@ -1,5 +1,7 @@
 language: cpp
 compiler: gcc
+dist: trusty
+sudo: required
 matrix:
     include:
         - env: TARGET_OS=win32

.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

.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

.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

.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