From 02a443460e297bd7808d18028f5b8cf8f797fe9d Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 6 Sep 2015 08:33:30 -0400
Subject: [PATCH 1/3] Switch to travis's container infrastructure.

Alledgedly, we'll get faster builds and performance. Considering how complex this repository is, it's worth trying. Note that sudo calls are not allowed with this container format at this time.
---
 .install-cmake.sh | 13 ++++++++----
 .travis.yml       | 51 ++++++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.install-cmake.sh b/.install-cmake.sh
index f4be8eb693..074d40ba1d 100755
--- a/.install-cmake.sh
+++ b/.install-cmake.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
-set -ex
-wget http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz
-tar -xzvf cmake-3.2.2.tar.gz
-cd cmake-3.2.2 && ./configure && make && sudo make install
+set -e
+# See if the cmake folder is empty.
+if [! -d "$HOME/cmake/lib"]; then
+	wget http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz
+	tar -xzf cmake-3.3.1.tar.gz
+	cd cmake-3.3.1 && ./configure --prefix=$HOME/cmake && make && make install
+else
+	echo "Using cached directory."
+fi
 
diff --git a/.travis.yml b/.travis.yml
index ea8ed113de..c5314c9535 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: cpp
 
+cache:
+    directories:
+      - $HOME/cmake
+
+sudo: false
+
 compiler:
     - clang
     - gcc
@@ -8,28 +14,31 @@ notifications:
     email: false
     irc: "chat.freenode.net#stepmania-devs"
 
+addons:
+    apt:
+        packages:
+            - nasm
+            - libmad0-dev
+            - libgtk2.0-dev
+            - binutils-dev
+            - libasound-dev
+            - libpulse-dev
+            - libjack-dev
+            - libc6-dev
+            - libogg-dev
+            - libbz2-dev
+            - libjpeg8-dev
+            - libpng12-dev
+            - libxtst-dev
+            - libxrandr-dev
+            - libglu1-mesa-dev
+            - mesa-common-dev
+            - libglew-dev
+
 before_script:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y nasm
-    - sudo apt-get install -y libmad0-dev
-    - sudo apt-get install -y libgtk2.0-dev
-    - sudo apt-get install -y binutils-dev
-    - sudo apt-get install -y libasound-dev
-    - sudo apt-get install -y libpulse-dev
-    - sudo apt-get install -y libjack-dev
-    - sudo apt-get install -y libc6-dev
-    - sudo apt-get install -y libogg-dev
-    - sudo apt-get install -y libvorbis-dev
-    - sudo apt-get install -y libbz2-dev
-    - sudo apt-get install -y zlib1g-dev
-    - sudo apt-get install -y libjpeg8-dev
-    - sudo apt-get install -y libpng12-dev
-    - sudo apt-get install -y libxtst-dev libxrandr-dev
-    - sudo apt-get install -y libglu1-mesa-dev
-    - sudo apt-get install -y mesa-common-dev
-    - sudo apt-get install -y libglew-dev
-    - ./.install-cmake.sh
+    - bash .install-cmake.sh
 
 script:
-    - cmake -DWITH_PORTABLE_TOMCRYPT=ON -G 'Unix Makefiles'
+    - cd Build
+    - $HOME/cmake/bin/cmake -DWITH_PORTABLE_TOMCRYPT=ON -G 'Unix Makefiles' ..
     - make

From e488674987e43b0aae5e6d6a5ca3760900c39280 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 6 Sep 2015 08:40:37 -0400
Subject: [PATCH 2/3] Whitespace fix.

---
 .install-cmake.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.install-cmake.sh b/.install-cmake.sh
index 074d40ba1d..2c263766cd 100755
--- a/.install-cmake.sh
+++ b/.install-cmake.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 # See if the cmake folder is empty.
-if [! -d "$HOME/cmake/lib"]; then
+if [ ! -d "$HOME/cmake/lib" ]; then
 	wget http://www.cmake.org/files/v3.3/cmake-3.3.1.tar.gz
 	tar -xzf cmake-3.3.1.tar.gz
 	cd cmake-3.3.1 && ./configure --prefix=$HOME/cmake && make && make install

From 70375a7e268719e85ed62491e1e20946d6f8577b Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Sun, 6 Sep 2015 08:52:24 -0400
Subject: [PATCH 3/3] ...I forgot libvorbis? Re-verify.

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

diff --git a/.travis.yml b/.travis.yml
index c5314c9535..6f213af8c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ addons:
             - libjack-dev
             - libc6-dev
             - libogg-dev
+            - libvorbis-dev
             - libbz2-dev
             - libjpeg8-dev
             - libpng12-dev