From 85838fb8f275184ec662c52a7b2cc1a88cfacc45 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:07:49 -0400
Subject: [PATCH 01/31] first attempt at building mesa from source

---
 scripts/travis_before_install.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index d3add138c..95fac390c 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -21,6 +21,18 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     sudo apt-get -y install git build-essential zlib1g-dev automake \
                             libtool xutils-dev make cmake pkg-config python-pip
 
+    mapbox_time "install_mesa_deps" \
+    sudo apt-get install -y libpthread-stubs0-dev \
+                            xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
+                            libxcb-glx0-dev libxrender-dev llvm-dev && \
+    sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
+
+    mapbox_time "build_mesa" \
+    git clone git://anongit.freedesktop.org/git/mesa/mesa && \
+    ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri --enable-xlib-glx && \
+    make && sudo make install && \
+    glxinfo
+
     mapbox_time "install_opengl" \
     sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev \
                             x11proto-xext-dev libxrandr-dev \

From 24798e8553c36c5089da0a8f17de8e4a11a8c943 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:16:17 -0400
Subject: [PATCH 02/31] cd mesa

---
 scripts/travis_before_install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 95fac390c..6378145fe 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -29,12 +29,14 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
+    cd mesa && \
     ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri --enable-xlib-glx && \
     make && sudo make install && \
-    glxinfo
+    glxinfo && \
+    cd ../
 
     mapbox_time "install_opengl" \
-    sudo apt-get -y install libxi-dev libglu1-mesa-dev x11proto-randr-dev \
+    sudo apt-get -y install libxi-dev x11proto-randr-dev \
                             x11proto-xext-dev libxrandr-dev \
                             x11proto-xf86vidmode-dev libxxf86vm-dev libxcursor-dev
 

From 9686df7518e78918c0d3e195f8307c0a7d3434ee Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:22:44 -0400
Subject: [PATCH 03/31] dont install llvm-dev

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 6378145fe..f5f451780 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,7 +24,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-dev && \
+                            libxcb-glx0-dev libxrender-dev && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \

From c5459ffb8917b95857d4ef414fe2850a1f291288 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:31:16 -0400
Subject: [PATCH 04/31] try building with llvm shared libs disabled

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index f5f451780..31584df55 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -30,7 +30,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
-    ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri --enable-xlib-glx && \
+    ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri \
+        --enable-xlib-glx --disable-llvm-shared-libs && \
     make && sudo make install && \
     glxinfo && \
     cd ../

From e94e9eb303fadc3c0df2a8031a6921b6ec91c8fe Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:47:05 -0400
Subject: [PATCH 05/31] add mesa-utils

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 31584df55..e9bcd7403 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,7 +24,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev && \
+                            libxcb-glx0-dev libxrender-dev mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \

From d3c21d1988838b6af659099d16b5ce5f3da23375 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 17:50:17 -0400
Subject: [PATCH 06/31] enable glx tls

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index e9bcd7403..162694fa5 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -31,7 +31,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --disable-llvm-shared-libs && \
+        --enable-xlib-glx --disable-llvm-shared-libs --enable-glx-tls && \
     make && sudo make install && \
     glxinfo && \
     cd ../

From d48e8ea5bcb48a69624b65e855dd3ecd3460973c Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Thu, 16 Oct 2014 18:12:07 -0400
Subject: [PATCH 07/31] install locally, export LD_LIBRARY_PATH

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 162694fa5..26a47983e 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -30,9 +30,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
-    ./autogen.sh --prefix=/usr --with-gallium-drivers=svga,swrast --disable-dri \
+    ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --disable-llvm-shared-libs --enable-glx-tls && \
     make && sudo make install && \
+    export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \
     cd ../
 

From 965fbee8ec7e5305f31b9a4968c5a7716ba8b7cf Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 12:16:15 -0400
Subject: [PATCH 08/31] use shared llvm lib with llvm-config-3.4

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 26a47983e..1aeceb9e2 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -31,7 +31,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --disable-llvm-shared-libs --enable-glx-tls && \
+        --enable-xlib-glx --enable-glx-tls \
+        --with-clang-libdir=llvm-config-3.4 --libdir && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \

From b04d239d7bf5f202a689129cf1d9820e4f9bbd9e Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 12:49:51 -0400
Subject: [PATCH 09/31] quotes around mesa arg

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 1aeceb9e2..4830bc258 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -32,7 +32,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls \
-        --with-clang-libdir=llvm-config-3.4 --libdir && \
+        --with-clang-libdir="llvm-config-3.4 --libdir" && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \

From 9deaa204a15b25b7f2b6523100de7cf70cf39d47 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 13:04:57 -0400
Subject: [PATCH 10/31] try --with-llvm-prefix

---
 scripts/travis_before_install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 4830bc258..1797eb638 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -31,8 +31,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls \
-        --with-clang-libdir="llvm-config-3.4 --libdir" && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4/lib && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \

From 84bfecc89a22da80f7c1da507a38bc3780f07fec Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 13:19:26 -0400
Subject: [PATCH 11/31] debugging llvm lib location

---
 scripts/travis_before_install.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 1797eb638..cd53316d6 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -27,6 +27,15 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
                             libxcb-glx0-dev libxrender-dev mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
+    ls -la /usr/lib
+    ls -la /usr/bin
+
+    ls -la /usr/local/lib
+    ls -la /usr/local/bin
+
+    llvm-config --libdir
+    llvm-config-3.4 --libdir
+
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \

From a335ff56a43cfd35157665fe9df92bd404d79596 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 13:30:44 -0400
Subject: [PATCH 12/31] install llvm-dev

---
 scripts/travis_before_install.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index cd53316d6..ec28e4fa1 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,17 +24,17 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-dev mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
-    ls -la /usr/lib
-    ls -la /usr/bin
+    ls -la /usr/lib | grep llvm
+    ls -la /usr/bin | grep llvm
 
-    ls -la /usr/local/lib
-    ls -la /usr/local/bin
+    ls -la /usr/local
+    ls -la /usr/local/clang-3.4
+    ls -la /usr/local/clang-3.4/lib
 
     llvm-config --libdir
-    llvm-config-3.4 --libdir
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \

From 366a756f9a6e704fd051719ba5e490f66a8a8e9b Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 13:41:54 -0400
Subject: [PATCH 13/31] trying install llvm-3.4

---
 scripts/travis_before_install.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index ec28e4fa1..2ec0714bf 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,23 +24,22 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-dev mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     ls -la /usr/lib | grep llvm
     ls -la /usr/bin | grep llvm
 
     ls -la /usr/local
-    ls -la /usr/local/clang-3.4
-    ls -la /usr/local/clang-3.4/lib
 
     llvm-config --libdir
+    llvm-config-3.4 --libdir
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4/lib && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/local/clang-3.4/lib && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \

From 5d6147d061b743379e0493f8351bf8408eb39184 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Fri, 17 Oct 2014 14:00:06 -0400
Subject: [PATCH 14/31] use llvm-3.4

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 2ec0714bf..a02019e82 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -39,7 +39,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/local/clang-3.4/lib && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
     glxinfo && \

From abcb5eed7cfaa3a5bb39dc0bdf6da110b3654641 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 14:49:59 -0400
Subject: [PATCH 15/31] move glxinfo out of travis_before_install.sh

---
 .travis.yml                      | 1 +
 scripts/travis_before_install.sh | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 78b2754a8..7f5c73377 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ before_install:
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
 - ./scripts/travis_before_install.sh
+- glxinfo
 
 install:
 - make setup
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index a02019e82..f67302606 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -27,14 +27,6 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
                             libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
-    ls -la /usr/lib | grep llvm
-    ls -la /usr/bin | grep llvm
-
-    ls -la /usr/local
-
-    llvm-config --libdir
-    llvm-config-3.4 --libdir
-
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
@@ -42,7 +34,6 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
     make && sudo make install && \
     export LD_LIBRARY_PATH=/usr/local/lib && \
-    glxinfo && \
     cd ../
 
     mapbox_time "install_opengl" \

From 6e51c1037afa1a32c6a893e5706aaa6f16b1b1c4 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 14:55:21 -0400
Subject: [PATCH 16/31] add tsan to mesa deps

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index f67302606..41c9955a9 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,7 +24,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 libtsan0 \
+                            mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \

From 1b93a7788907368b865fd3cffe23b38a82c4043c Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 14:57:17 -0400
Subject: [PATCH 17/31] add libva-dev to mesa deps

---
 scripts/travis_before_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 41c9955a9..2fd9200c2 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,8 +24,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-3.4 libtsan0 \
-                            mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 libva-dev \
+                            libtsan0 mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \

From f43fc181a88d6e5d5808ab5bcd71d92b35e16360 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 15:44:55 -0400
Subject: [PATCH 18/31] travis fold glxinfo, set LD_LIBRARY_PATH env var

---
 .travis.yml                      | 2 +-
 scripts/travis_before_install.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f5c73377..edcd19565 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,12 +23,12 @@ env:
    - secure: "R/+uOeccl7GqjJbknailAV7VtjAtGwHHM9xToVnhfPVUXp9fzJs+oNk3IWcs3Eg4sw4WsYxXRfbCQG9bA3MnPlTOsxETGRioO9CAuXap6mwcwNAzeWuq7ePFki2u01pJGQD5b6WFqBCdnAQ4o2SgHgGzhs0TJzYd9tONQxSmkCI="
    - secure: "RiBIBfVhhaMjU5ksuwJO3shdvG9FpinBjdSv4co9jg9171SR8edNriedHjVKSIeBhSGNmZmX+twS3dJS/By6tl/LKh9sTynA+ZAYYljkE7jn881B/gMrlYvdAA6og5KvkhV1/0iJWlhuZrMTkhpDR200iLgg3EWBhWjltzmDW/I="
    - AWS_S3_BUCKET: 'node-mapbox-gl-native'
+   - LD_LIBRARY_PATH: '/usr/local/lib'
 
 before_install:
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
 - ./scripts/travis_before_install.sh
-- glxinfo
 
 install:
 - make setup
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 2fd9200c2..12fdd9788 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -34,9 +34,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
     make && sudo make install && \
-    export LD_LIBRARY_PATH=/usr/local/lib && \
     cd ../
 
+    mapbox_time "glxinfo" \
+    glxinfo
+
     mapbox_time "install_opengl" \
     sudo apt-get -y install libxi-dev x11proto-randr-dev \
                             x11proto-xext-dev libxrandr-dev \

From fabe5f9769962c61c9f57a06ddafb19b299f0bbe Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 16:07:03 -0400
Subject: [PATCH 19/31] build mesa without libva

---
 scripts/travis_before_install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 12fdd9788..c25caa9d0 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,15 +24,16 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-3.4 libva-dev \
-                            libtsan0 mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 libtsan0 \
+                            mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
+        --disable-va && \
     make && sudo make install && \
     cd ../
 

From 4c3debb9d7c4b99e0809a1f0204059ecc255a6d9 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 16:52:16 -0400
Subject: [PATCH 20/31] glxinfo in main process, build libva from source

---
 .travis.yml                      |  1 +
 scripts/travis_before_install.sh | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index edcd19565..fa5bec468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ before_install:
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
 - ./scripts/travis_before_install.sh
+- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi
 
 install:
 - make setup
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index c25caa9d0..24acce0bc 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -24,22 +24,26 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "install_mesa_deps" \
     sudo apt-get install -y libpthread-stubs0-dev \
                             xserver-xorg-dev x11proto-xinerama-dev libx11-xcb-dev \
-                            libxcb-glx0-dev libxrender-dev llvm-3.4 libtsan0 \
-                            mesa-utils && \
+                            libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
+    mapbox_time "build_libva" \
+    sudo apt-get install -y libgl1-mesa-dev libpciaccess-dev libdrm-dev \
+                            libXfixes-dev libXext-dev && \
+    git clone git://anongit.freedesktop.org/git/vaapi/libva && \
+    cd libva && \
+    ./autogen.sh && \
+    make && sudo make install && \
+    cd ../
+
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
-        --disable-va && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
     make && sudo make install && \
     cd ../
 
-    mapbox_time "glxinfo" \
-    glxinfo
-
     mapbox_time "install_opengl" \
     sudo apt-get -y install libxi-dev x11proto-randr-dev \
                             x11proto-xext-dev libxrandr-dev \

From 898b27eb34550db02d9f64314a7faaf729e462b3 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 17:34:26 -0400
Subject: [PATCH 21/31] build mesa 10.3.1, install libva with root login shell,
 ref travis-ci/travis-ci#2607

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 24acce0bc..b3d2f532b 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -33,11 +33,12 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/vaapi/libva && \
     cd libva && \
     ./autogen.sh && \
-    make && sudo make install && \
+    make && sudo -i make install && \
     cd ../
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
+    git checkout mesa-10.3.1 && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \

From 907ffb88c351a3f71e514c9ee106428acdab8eef Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 18:05:27 -0400
Subject: [PATCH 22/31] try exporting  for sudo

---
 scripts/travis_before_install.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index b3d2f532b..61961a170 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -33,7 +33,13 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     git clone git://anongit.freedesktop.org/git/vaapi/libva && \
     cd libva && \
     ./autogen.sh && \
-    make && sudo -i make install && \
+    make && \
+    $CC --version && \
+    which $CC && \
+    clang --version && \
+    which clang && \
+    export $CC=`which $CC` && \
+    sudo make install && \
     cd ../
 
     mapbox_time "build_mesa" \

From 2b23ca07400733134ba756a6a3c19eadaf7f20af Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 18:06:19 -0400
Subject: [PATCH 23/31] back to building mesa without libva

---
 scripts/travis_before_install.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 61961a170..034ee1819 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -27,27 +27,13 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
                             libxcb-glx0-dev libxrender-dev llvm-3.4 mesa-utils && \
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
-    mapbox_time "build_libva" \
-    sudo apt-get install -y libgl1-mesa-dev libpciaccess-dev libdrm-dev \
-                            libXfixes-dev libXext-dev && \
-    git clone git://anongit.freedesktop.org/git/vaapi/libva && \
-    cd libva && \
-    ./autogen.sh && \
-    make && \
-    $CC --version && \
-    which $CC && \
-    clang --version && \
-    which clang && \
-    export $CC=`which $CC` && \
-    sudo make install && \
-    cd ../
-
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     git checkout mesa-10.3.1 && \
     cd mesa && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
-        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 && \
+        --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
+        --without-va && \
     make && sudo make install && \
     cd ../
 

From c50ccc420d57b3358d5a32e8ed5b9a25efc5f01a Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 18:18:42 -0400
Subject: [PATCH 24/31] download mesa 10.3.1 from ftp

---
 scripts/travis_before_install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 034ee1819..aea8fb446 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -29,8 +29,13 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
-    git checkout mesa-10.3.1 && \
-    cd mesa && \
+    git tag -l && \
+    cd ../ && \
+    wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz && \
+    wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz.sig && \
+    gpg --verify MesaLib-10.3.1.tar.gz.sig && \
+    tar xzvf MesaLib-10.3.1.tar.gz && \
+    cd Mesa-10.3.1 && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
         --without-va && \

From 62908177cb1f3b4df9ea98f0bd17a2d39ec90ebd Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 18:30:15 -0400
Subject: [PATCH 25/31] drop signature, git tag -l in mesa directory

---
 scripts/travis_before_install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index aea8fb446..0eb1cb9bd 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -29,11 +29,12 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
 
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
+    cd mesa && \
     git tag -l && \
     cd ../ && \
     wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz && \
     wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz.sig && \
-    gpg --verify MesaLib-10.3.1.tar.gz.sig && \
+    # gpg --verify MesaLib-10.3.1.tar.gz.sig && \
     tar xzvf MesaLib-10.3.1.tar.gz && \
     cd Mesa-10.3.1 && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \

From 5c7ce692c727e0047096d0ff10e66e1322925a00 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Mon, 20 Oct 2014 18:50:09 -0400
Subject: [PATCH 26/31] build mesa from git

---
 scripts/travis_before_install.sh | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 0eb1cb9bd..7cc6d98d0 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -30,13 +30,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     mapbox_time "build_mesa" \
     git clone git://anongit.freedesktop.org/git/mesa/mesa && \
     cd mesa && \
-    git tag -l && \
-    cd ../ && \
-    wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz && \
-    wget ftp://ftp.freedesktop.org/pub/mesa/10.3.1/MesaLib-10.3.1.tar.gz.sig && \
-    # gpg --verify MesaLib-10.3.1.tar.gz.sig && \
-    tar xzvf MesaLib-10.3.1.tar.gz && \
-    cd Mesa-10.3.1 && \
+    git checkout mesa-10.3.1 && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
         --without-va && \

From a0d0b3996055955f59d2f59346d5bbbe4e08eee6 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Wed, 22 Oct 2014 17:14:00 -0400
Subject: [PATCH 27/31] set fPIE instead of fPIC in CXXFLAGS, add to CFLAGS as
 well

---
 scripts/flags.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/flags.sh b/scripts/flags.sh
index 2b4624aa1..5e54ec33f 100755
--- a/scripts/flags.sh
+++ b/scripts/flags.sh
@@ -22,8 +22,8 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
             export CFLAGS="-fsanitize=address -g ${CFLAGS}"
             export LDFLAGS="-fsanitize=address  ${LDFLAGS}"
         elif [[ ${CXX} == "clang++" ]]; then
-            export CXXFLAGS="-fsanitize=thread -g -fPIC ${CXXFLAGS}"
-            export CFLAGS="-fsanitize=thread -g ${CFLAGS}"
+            export CXXFLAGS="-fsanitize=thread -g -fPIE ${CXXFLAGS}"
+            export CFLAGS="-fsanitize=thread -g -fPIE ${CFLAGS}"
             export LDFLAGS="-fsanitize=thread -pie ${LDFLAGS}"
         fi
     fi

From 2c9dfa7cd54b2c7a74ea17f7c51c52678f78a494 Mon Sep 17 00:00:00 2001
From: Mike Morris <michael.patrick.morris@gmail.com>
Date: Wed, 22 Oct 2014 17:37:25 -0400
Subject: [PATCH 28/31] echo CFLAGS

---
 scripts/travis_before_install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 6ec6d537b..6d7936f13 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -37,6 +37,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
         --without-va && \
+    echo $CXXFLAGS
+    echo $CFLAGS
+    echo $LDFLAGS
     make && sudo make install && \
     cd ../
 

From da47943e21516da15a903f3001dfafa9da8bac48 Mon Sep 17 00:00:00 2001
From: Young Hahn <young@mapbox.com>
Date: Tue, 28 Oct 2014 14:36:32 -0400
Subject: [PATCH 29/31] Try installing mesa from a tarball rather than git
 clone.

---
 scripts/travis_before_install.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 7ec2f349c..7c308d580 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -31,9 +31,9 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     sudo apt-get build-dep -y libgl1-mesa-dri libxcb-glx0-dev
 
     mapbox_time "build_mesa" \
-    git clone git://anongit.freedesktop.org/git/mesa/mesa && \
-    cd mesa && \
-    git checkout mesa-10.3.1 && \
+    curl -sfo MesaLib-10.3.1.tar.gz http://ftp.de.debian.org/debian/pool/main/m/mesa/mesa_10.3.1.orig.tar.gz && \
+    tar -zxf MesaLib-10.3.1.tar.gz && \
+    cd Mesa-10.3.1 && \
     ./autogen.sh --with-gallium-drivers=svga,swrast --disable-dri \
         --enable-xlib-glx --enable-glx-tls --with-llvm-prefix=/usr/lib/llvm-3.4 \
         --without-va && \

From 543d4568d582742ab036495af09222471e5e54ce Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Wed, 29 Oct 2014 23:58:22 -0400
Subject: [PATCH 30/31] more build concurrency

---
 scripts/travis_before_install.sh | 2 +-
 scripts/travis_script.sh         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 7c308d580..0cf21e0fe 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     echo $CXXFLAGS
     echo $CFLAGS
     echo $LDFLAGS
-    make && sudo make install && \
+    make -j$(nproc) && sudo make install && \
     cd ../
 
     mapbox_time "install_opengl" \
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f306dbcb7..8e2f92163 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     # build & test Linux
     #
     mapbox_time "compile_program" \
-    make linux -j4 BUILDTYPE=${BUILDTYPE}
+    make linux -j$(nproc) BUILDTYPE=${BUILDTYPE}
 
     mapbox_time "compile_tests" \
-    make test -j4 BUILDTYPE=${BUILDTYPE}
+    make test -j$(nproc) BUILDTYPE=${BUILDTYPE}
 
     mapbox_time "run_tests" \
     ./scripts/run_tests.sh

From be299fba492af9daf48abf0534400e4c1c0105fc Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Thu, 30 Oct 2014 00:09:08 -0400
Subject: [PATCH 31/31] try mesa without concurrent jobs

---
 scripts/travis_before_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 0cf21e0fe..7c308d580 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     echo $CXXFLAGS
     echo $CFLAGS
     echo $LDFLAGS
-    make -j$(nproc) && sudo make install && \
+    make && sudo make install && \
     cd ../
 
     mapbox_time "install_opengl" \