From d09e3f3f68420c875fd41a62e646de78a0a42cf3 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 13 Jun 2019 08:09:09 +0100
Subject: [PATCH 1/2] Update Travis CI configuration to be compatible with
 Ubuntu Xenial.

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

diff --git a/.travis.yml b/.travis.yml
index c7f757eb3..6ab73478c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: generic
+dist: xenial
+services:
+  - xvfb
 
 addons:
   apt:
@@ -47,8 +50,6 @@ before_install:
   - ci/install-edm.sh
   - export PATH="${HOME}/edm/bin:/usr/lib/ccache:${PATH}"
   - edm install -y wheel click coverage
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 install:
   - for toolkit in ${TOOLKITS}; do edm run -- python ci/edmtool.py install --runtime=${RUNTIME} --toolkit=${toolkit} --pillow=${PILLOW} || exit; done
 script:

From eb3f1e1e8149aae92d3a5a7c3502bd8756e7e47e Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 13 Jun 2019 08:30:10 +0100
Subject: [PATCH 2/2] Attempt to add relevant OpenGL libraries.

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

diff --git a/.travis.yml b/.travis.yml
index 6ab73478c..387a128ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,8 @@ addons:
     - libpng-dev
     - libfreetype6-dev
     - libcairo2-dev
+    - libglu1-mesa-dev
+    - mesa-common-dev
 
 env:
   global: