From 111c8ecea64bc9ca23eeffcb27e8581c49e24433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Tue, 1 Sep 2020 16:55:53 +0200
Subject: [PATCH] Move Wayland build CI to focal

This finally allows us to drop the Wayland workarounds for CI.

Thanks Travis CI!

(cherry picked from commit b3a79103a696f31f964484df4e5d24a590f98aa9)
---
 .travis.yml | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc924a90..8e2619bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,14 +34,13 @@ matrix:
               - BUILD_SHARED_LIBS=OFF
               - CFLAGS=-Werror
         - os: linux
-          dist: xenial
+          dist: focal
           name: "Wayland shared library"
           addons:
               apt:
-                  sources:
-                      - ppa:kubuntu-ppa/backports
                   packages:
                       - extra-cmake-modules
+                      - wayland-protocols
                       - libwayland-dev
                       - libxkbcommon-dev
                       - libegl1-mesa-dev
@@ -50,14 +49,13 @@ matrix:
               - BUILD_SHARED_LIBS=ON
               - CFLAGS=-Werror
         - os: linux
-          dist: xenial
+          dist: focal
           name: "Wayland static library"
           addons:
               apt:
-                  sources:
-                      - ppa:kubuntu-ppa/backports
                   packages:
                       - extra-cmake-modules
+                      - wayland-protocols
                       - libwayland-dev
                       - libxkbcommon-dev
                       - libegl1-mesa-dev
@@ -106,12 +104,6 @@ script:
       fi
     - mkdir build
     - cd build
-    - if test -n "${USE_WAYLAND}"; then
-          git clone git://anongit.freedesktop.org/wayland/wayland-protocols;
-          pushd wayland-protocols;
-          git checkout 1.15 && ./autogen.sh --prefix=/usr && make && sudo make install;
-          popd;
-      fi
     - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} -DGLFW_USE_OSMESA=${USE_OSMESA} ..
     - cmake --build .
 notifications: