From 1b2379509742d4bc5e77ee78df0d66e1ff7077cd Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Thu, 3 Nov 2016 16:46:58 +0200
Subject: [PATCH] [linux] Update target headless backends

Enable OSMesa backend via WITH_OSMESA=1 envvar.

OSMesa backend uses Gallium OSMesa implementation, which uses
LLVMpipe as default driver.
---
 .mason                  |  2 +-
 .travis.yml             |  5 ++---
 scripts/travis_setup.sh | 28 ++++++++++++++--------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.mason b/.mason
index 48ea4761b..4279f5878 160000
--- a/.mason
+++ b/.mason
@@ -1 +1 @@
-Subproject commit 48ea4761bd386f9113397a4366d63e83e3586644
+Subproject commit 4279f58787acba8286789f861cf7c3c4ce47d522
diff --git a/.travis.yml b/.travis.yml
index 6c749acfd..25744e128 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ addons_shortcuts:
   addons_clang35: &clang35
     apt:
       sources:  [ 'ubuntu-toolchain-r-test', 'george-edison55-precise-backports' ]
-      packages: [ 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'cmake', 'cmake-data',
+      packages: [ 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.8v4', 'cmake', 'cmake-data',
                   'mesa-utils', 'libxi-dev', 'libglu1-mesa-dev', 'x11proto-randr-dev', 'x11proto-xext-dev', 'libxrandr-dev',
                   'x11proto-xf86vidmode-dev', 'libxxf86vm-dev', 'libxcursor-dev', 'libxinerama-dev' ]
   addons_gcc5: &gcc5
@@ -46,7 +46,6 @@ before_script:
 script:
   - make linux
   - make benchmark
-  - make test
   - make run-test
 after_script:
   - ccache --show-stats
@@ -60,7 +59,7 @@ matrix:
       dist: trusty
       language: node
       compiler: "node4-clang35-debug"
-      env: _CXX=clang++-3.5 _CC=clang-3.5
+      env: _CXX=clang++-3.5 _CC=clang-3.5 WITH_OSMESA=1
       addons: *clang35
       before_script:
         - export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
diff --git a/scripts/travis_setup.sh b/scripts/travis_setup.sh
index ae8dda46b..6fa1cc858 100755
--- a/scripts/travis_setup.sh
+++ b/scripts/travis_setup.sh
@@ -30,16 +30,6 @@ ${CXX} --version
 # Ensure mason is on the PATH
 export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
 
-# Start the mock X server
-if [ -f /etc/init.d/xvfb ] ; then
-    mapbox_time "start_xvfb" \
-    sh -e /etc/init.d/xvfb start
-    sleep 2 # sometimes, xvfb takes some time to start up
-fi
-
-# Make sure we're connecting to xvfb
-export DISPLAY=:99.0
-
 mapbox_time "checkout_mason" \
 git submodule update --init .mason
 
@@ -47,10 +37,20 @@ git submodule update --init .mason
 mapbox_time "touch_package_json" \
 touch package.json
 
-# Install and set up to load a more recent version of mesa
-mapbox_time "install_mesa" \
-mason install mesa 11.2.2
-export LD_LIBRARY_PATH="`mason prefix mesa 11.2.2`/lib:${LD_LIBRARY_PATH:-}"
+# Start the mock X server
+if [ -f /etc/init.d/xvfb ] && [ -z "${WITH_OSMESA}" ]; then
+    mapbox_time "start_xvfb" \
+    sh -e /etc/init.d/xvfb start
+    sleep 2 # sometimes, xvfb takes some time to start up
+
+    # Make sure we're connecting to xvfb
+    export DISPLAY=:99.0
+
+    # Install and set up to load a more recent version of mesa
+    mapbox_time "install_mesa" \
+    mason install mesa 11.2.2
+    export LD_LIBRARY_PATH="`mason prefix mesa 11.2.2`/lib:${LD_LIBRARY_PATH:-}"
+fi
 
 # Install and set up to load awscli
 pip install --user awscli