From c2db2012683bf545897e6c763e3bec59b2fc8ca5 Mon Sep 17 00:00:00 2001
From: Squareys <squareys@googlemail.com>
Date: Tue, 16 May 2017 14:37:09 +0200
Subject: [PATCH 1/3] ci: Explicitly set travis distro to trusty

---
 package/ci/travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/package/ci/travis.yml b/package/ci/travis.yml
index 05e8038ac..51fc02c07 100644
--- a/package/ci/travis.yml
+++ b/package/ci/travis.yml
@@ -1,5 +1,8 @@
 # kate: indent-width 2;
 
+# trusty has cmake >= 2.8.12 in the official package repository
+dist: trusty
+
 addons:
   apt:
     sources:
@@ -9,6 +12,9 @@ addons:
     - g++-4.7
     - cmake
     - libopenal-dev
+    - libxrandr-dev
+    - libxinerama-dev
+    - libxcursor-dev
 
 matrix:
   include:
@@ -39,6 +45,9 @@ matrix:
         - clang-3.8
         - cmake
         - libopenal-dev
+        - libxrandr-dev
+        - libxinerama-dev
+        - libxcursor-dev
   - language: cpp
     os: linux
     compiler: gcc

From 292fa5d22798ee6dee56669adc17d27b52661315 Mon Sep 17 00:00:00 2001
From: Squareys <squareys@googlemail.com>
Date: Thu, 18 May 2017 15:42:03 +0200
Subject: [PATCH 2/3] ci: Reenable linux with GLES3 configuration on travis

---
 package/ci/travis.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/ci/travis.yml b/package/ci/travis.yml
index 51fc02c07..ce0614c3b 100644
--- a/package/ci/travis.yml
+++ b/package/ci/travis.yml
@@ -54,14 +54,12 @@ matrix:
     env:
     - TARGET=desktop-gles
     - TARGET_GLES2=ON
-  # Disabled because the Ubuntu 12.04 drivers are missing some ES3 entrypoints
-  # Should be enabled after moving to 14.04
-  #- language: cpp
-    #os: linux
-    #compiler: gcc
-    #env:
-    #- TARGET=desktop-gles
-    #- TARGET_GLES2=OFF
+  - language: cpp
+    os: linux
+    compiler: gcc
+    env:
+    - TARGET=desktop-gles
+    - TARGET_GLES2=OFF
   - language: cpp
     os: osx
     compiler: clang

From 2fdc89717c89bd869a9d4dc8301ac1e478a6d105 Mon Sep 17 00:00:00 2001
From: Squareys <squareys@googlemail.com>
Date: Thu, 18 May 2017 16:09:08 +0200
Subject: [PATCH 3/3] ci: Use -O2 for emscripten build

Emscripten crashes with -O1
---
 package/ci/travis-emscripten.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
index 846341499..b2bde0356 100755
--- a/package/ci/travis-emscripten.sh
+++ b/package/ci/travis-emscripten.sh
@@ -42,8 +42,8 @@ cmake .. \
     -DCMAKE_TOOLCHAIN_FILE="../toolchains/generic/Emscripten.cmake" \
     -DEMSCRIPTEN_PREFIX=$(echo /usr/local/Cellar/emscripten/*/libexec) \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O1" \
-    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \
+    -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG -O2" \
+    -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O2" \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=ON \