From ccfc9011e24d952beb61a5051c90581cc7106e36 Mon Sep 17 00:00:00 2001
From: Zack Middleton <zack@cloemail.com>
Date: Sat, 24 Jun 2017 20:51:07 -0500
Subject: [PATCH] travis-ci: Upgrade to docker build system

---
 .travis.yml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fd29260..09eb7699 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,8 @@
+# sudo is required for travis-ci to use ubuntu trusty
+# ubuntu trusty is required for libsdl2-dev
+sudo: required
+dist: trusty
+
 language: c
 
 env:
@@ -17,16 +22,21 @@ env:
 
 script: ./travis-ci-build.sh
 
-before_install:
-  - echo "yes" | sudo apt-add-repository ppa:zoogie/sdl2-snapshots
-  - sudo apt-get update -qq
-  - sudo apt-get remove -qq -y mingw32
-  - sudo apt-get install -q -y libgl1-mesa-dev libsdl2-dev libfreetype6-dev mingw-w64
-
 notifications:
   email: false
 
 addons:
+  apt:
+    packages:
+      - binutils-mingw-w64-i686
+      - gcc-mingw-w64-i686
+      - binutils-mingw-w64-x86-64
+      - gcc-mingw-w64-x86-64
+      - gcc-mingw-w64
+      - mingw-w64
+      - libgl1-mesa-dev
+      - libsdl2-dev
+      - libfreetype6-dev
   coverity_scan:
     project:
       name: "ioquake/ioq3"