From 19b39de351d9329a10dc42e2906e919018100661 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Tue, 19 Jan 2016 11:15:36 +0100
Subject: [PATCH 1/4] use trusty

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 0910ac546..10b47ee7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ os:
  - linux
 # - osx
 language: cpp
+sudo: required
+dist: trusty
 branches:
   only:
     - master

From 339fbe23a7c0f1d89e683f6fa41728a7b5c3d428 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 20 Jan 2016 14:03:51 +0100
Subject: [PATCH 2/4] remove precise cruft

---
 CI/before_install.linux.sh | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CI/before_install.linux.sh b/CI/before_install.linux.sh
index 6e288aa14..1c02bc8d9 100755
--- a/CI/before_install.linux.sh
+++ b/CI/before_install.linux.sh
@@ -1,22 +1,17 @@
 #!/bin/sh
 
 if [ "${ANALYZE}" ]; then
-  if [ $(lsb_release -sc) = "precise" ]; then
-    echo "yes" | sudo apt-add-repository ppa:ubuntu-toolchain-r/test
-  fi
   echo "yes" | sudo add-apt-repository "deb http://llvm.org/apt/`lsb_release -sc`/ llvm-toolchain-`lsb_release -sc`-3.6 main"
   wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
 fi
 
 echo "yes" | sudo add-apt-repository "deb http://archive.ubuntu.com/ubuntu `lsb_release -sc` main universe restricted multiverse"
 echo "yes" | sudo apt-add-repository ppa:openmw/openmw
-echo "yes" | sudo apt-add-repository ppa:boost-latest/ppa
 sudo apt-get update -qq
 sudo apt-get install -qq libgtest-dev google-mock
-sudo apt-get install -qq libboost-filesystem1.55-dev libboost-program-options1.55-dev libboost-system1.55-dev libboost-thread1.55-dev
-sudo apt-get install -qq ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
+sudo apt-get install -qq libboost-filesystem-dev libboost-program-options-dev libboost-system-dev libboost-thread-dev
+sudo apt-get install -qq libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev
 sudo apt-get install -qq libbullet-dev libopenscenegraph-dev libmygui-dev libsdl2-dev libunshield-dev libtinyxml-dev libopenal-dev libqt4-dev
-sudo apt-get install -qq cmake-data #workaround for broken osgqt cmake script in ubuntu 12.04
 if [ "${ANALYZE}" ]; then sudo apt-get install -qq clang-3.6; fi
 sudo mkdir /usr/src/gtest/build
 cd /usr/src/gtest/build

From b8d19eb9cd09324b456c23a3f968a51d03432596 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Wed, 20 Jan 2016 14:30:33 +0100
Subject: [PATCH 3/4] make use of 2 dedicated cores while assuming both are
 blocked on I/O

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 10b47ee7d..3a76944fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ before_script:
  - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./CI/before_script.osx.sh; fi
 script:
  - cd ./build
- - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j2; fi
+ - if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then ${ANALYZE}make -j3; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi

From 10609ca5d1d9e6abaa76978a06b830eaaa217530 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 21 Jan 2016 09:22:42 +0100
Subject: [PATCH 4/4] how much memory in our vm?

---
 CI/before_script.linux.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CI/before_script.linux.sh b/CI/before_script.linux.sh
index 71ddd2040..17667ad28 100755
--- a/CI/before_script.linux.sh
+++ b/CI/before_script.linux.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+free -m
 mkdir build
 cd build
 export CODE_COVERAGE=1