From 189c6bb0eec810594c2a021631e98bb5583c70b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur@gmail.com>
Date: Wed, 5 Aug 2015 22:17:31 +0200
Subject: [PATCH] travis fixes

---
 .travis.yml          |  2 ++
 CMakeLists.txt       |  2 +-
 CMakeLists_mingw.txt |  2 +-
 install.sh           | 34 ++++++++++++++++++++++------------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 067ef67593..863be8d7cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,3 +15,5 @@ cache:
     directories:
         - cache
     apt: true
+
+sudo: required
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3d7289ca5..61c3331c74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@ if (UNIX)
 
 	# find and include SDL2
 	INCLUDE(FindPkgConfig)
-	PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+	PKG_CHECK_MODULES(SDL2 REQUIRED sdl2 SDL2_ttf)
 	INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
 endif (UNIX)
 
diff --git a/CMakeLists_mingw.txt b/CMakeLists_mingw.txt
index 538bdecf4e..580a84235f 100644
--- a/CMakeLists_mingw.txt
+++ b/CMakeLists_mingw.txt
@@ -20,7 +20,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 # find and include SDL2
 INCLUDE(FindPkgConfig)
-PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+PKG_CHECK_MODULES(SDL2 REQUIRED sdl2 SDL2_ttf)
 INCLUDE_DIRECTORIES(${SDL2_INCLUDE_DIRS})
 
 if(APPLE)
diff --git a/install.sh b/install.sh
index 22fd15a6a3..7a3588113a 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 SDL2_PV=2.0.3
+SDL2_TTF_PV=2.0.12
 
 cachedir=.cache
 mkdir -p $cachedir
@@ -76,33 +77,41 @@ elif [[ `uname` == "Linux" ]]; then
     sudo apt-get install -y --force-yes binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake
 fi
 
-if [[ ! -f $cachedir/SDL2-devel-${SDL2_PV}-mingw.tar.gz ]]; then 
-    wget http://libsdl.org/release/SDL2-devel-${SDL2_PV}-mingw.tar.gz --output-document $cachedir/SDL2-devel-${SDL2_PV}-mingw.tar.gz; 
+if [[ ! -f $cachedir/SDL2-devel-${SDL2_PV}-mingw.tar.gz ]]; then
+    wget http://libsdl.org/release/SDL2-devel-${SDL2_PV}-mingw.tar.gz --output-document $cachedir/SDL2-devel-${SDL2_PV}-mingw.tar.gz;
+fi
+if [[ ! -f $cachedir/SDL2_ttf-devel-${SDL2_TTF_PV}-mingw.tar.gz ]]; then
+    wget https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-${SDL2_TTF_PV}-mingw.tar.gz --output-document $cachedir/SDL2_ttf-devel-${SDL2_TTF_PV}-mingw.tar.gz;
 fi
 if [[ ! -d $cachedir/SDL2-${SDL2_PV} ]]; then
-    pushd $cachedir 
-        tar -xzf SDL2-devel-${SDL2_PV}-mingw.tar.gz 
+    pushd $cachedir
+        tar -xzf SDL2-devel-${SDL2_PV}-mingw.tar.gz
     popd
 fi
-if [[ ! -f $cachedir/orctlibs.zip ]]; then 
-    curl https://download.openrct2.website/dev/lib/mingw -o $cachedir/orctlibs.zip; 
+if [[ ! -d $cachedir/SDL2_ttf-${SDL2_TTF_PV} ]]; then
+    pushd $cachedir
+        tar -xzf SDL2_ttf-devel-${SDL2_TTF_PV}-mingw.tar.gz
+    popd
+fi
+if [[ ! -f $cachedir/orctlibs.zip ]]; then
+    curl https://download.openrct2.website/dev/lib/mingw -o $cachedir/orctlibs.zip;
 fi
 if [[ ! -d $cachedir/orctlibs ]]; then
     mkdir -p $cachedir/orctlibs
     pushd $cachedir/orctlibs
-        unzip -uaq ../orctlibs.zip 
+        unzip -uaq ../orctlibs.zip
     popd
 fi
 
 # Apply platform patch
 mingw_patch=libsdl2-mingw-2.0.3-fix-platform-detection-for-mingw.patch
-if [[ ! -f $cachedir/$mingw_patch ]]; then 
-    wget "https://github.com/anyc/anyc-overlay/raw/master/media-libs/libsdl2-mingw/files/$mingw_patch" --output-document $cachedir/$mingw_patch; 
+if [[ ! -f $cachedir/$mingw_patch ]]; then
+    wget "https://github.com/anyc/anyc-overlay/raw/master/media-libs/libsdl2-mingw/files/$mingw_patch" --output-document $cachedir/$mingw_patch;
 
     # XXX not sure how to make this idempotent.
-    pushd $cachedir/SDL2-${SDL2_PV}/i686-w64-mingw32/include/SDL2/ 
+    pushd $cachedir/SDL2-${SDL2_PV}/i686-w64-mingw32/include/SDL2/
         echo "Applying patch."
-        patch -p2 < ../../../../$mingw_patch 
+        patch -p2 < ../../../../$mingw_patch
     popd
 fi
 
@@ -111,12 +120,13 @@ if [[ ! -d /usr/local/cross-tools ]]; then
 fi
 if [[ ! -d /usr/local/cross-tools/i686-w64-mingw32 ]]; then
     sudo cp -r $cachedir/SDL2-${SDL2_PV}/i686-w64-mingw32 /usr/local/cross-tools/
+    sudo cp -r $cachedir/SDL2_ttf-${SDL2_TTF_PV}/i686-w64-mingw32 /usr/local/cross-tools/
 fi
 if [[ ! -d /usr/local/cross-tools/orctlibs ]]; then
     sudo mkdir -p /usr/local/cross-tools/orctlibs
     mkdir -p lib
     sudo cp -rf $cachedir/orctlibs/glob/* /usr/local/cross-tools/orctlibs/.
-    cp -rf $cachedir/orctlibs/local/* ./lib/. 
+    cp -rf $cachedir/orctlibs/local/* ./lib/.
 fi
 
 if [[ ! -f $cachedir/i686-w64-mingw32-pkg-config ]]; then