From 1439602123cfda4fcdde668f36855c2986392db3 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 9 Apr 2019 11:09:14 -0400
Subject: [PATCH 1/3] Switch to Xenial for Linux CI.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e586dc8d928..3268dbf5bd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ matrix:
          - bash etc/ci/check_no_panic.sh
       cache: false
     - sudo: 9000
-      dist: trusty
+      dist: xenial
       before_install:
         - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
         - sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y

From 331d304a6f2cc93d43d8ceb894f816fb051a8295 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 9 Apr 2019 17:17:35 -0400
Subject: [PATCH 2/3] Use dev LLVM package from xenial apt repo.

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

diff --git a/.travis.yml b/.travis.yml
index 3268dbf5bd5..ec1b34b956d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,9 @@ matrix:
       dist: xenial
       before_install:
         - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-        - sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y
+        - sudo add-apt-repository 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-3.9 main' -y
         - sudo apt-get update -q
-        - sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime libunwind8-dev -y
+        - sudo apt-get install clang-3.9 llvm-3.9-dev llvm-3.9-runtime libunwind8-dev -y
         - pip install virtualenv
         - curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
         - sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
@@ -29,7 +29,7 @@ matrix:
         - export GST_PLUGIN_SCANNER=$PWD/gst/libexec/gstreamer-1.0/gst-plugin-scanner
         - export PATH=$PATH:$PWD/gst/bin
         - export LD_LIBRARY_PATH=$PWD/gst/lib:$LD_LIBRARY_PATH
-        - export LLVM_CONFIG=/usr/lib/llvm-3.9/bin/llvm-config
+        - export LLVM_CONFIG=llvm-config-3.9
         - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
         - source ~/.profile
       script:

From aebb1f00a27959ad19d7945841cd54e722de442b Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 9 Apr 2019 18:06:15 -0400
Subject: [PATCH 3/3] Install dev mesa GL utilities package.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ec1b34b956d..a2933373eb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,6 +66,7 @@ matrix:
             - g++-6
             - gperf
             - libosmesa6-dev
+            - libglu1-mesa-dev
             - libgles2-mesa-dev
             - python-virtualenv
             - xorg-dev