From 15e05675fbcc6449c3bcb7869666e8913127e77c Mon Sep 17 00:00:00 2001
From: Kleis Auke Wolthuizen <github@kleisauke.nl>
Date: Thu, 7 Jan 2021 14:37:33 +0100
Subject: [PATCH] Travis: use Clang provided by XCode

+ include missing dependencies and build without magick.
---
 .travis.yml | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a27bfbd5..bebdeff5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,24 +44,27 @@ addons:
     update: true
     packages:
       - ccache
-      - gtk-doc
-      - gobject-introspection
-      - fftw
-      - libexif
-      - libjpeg-turbo
-      - webp
-      - imagemagick
       - cfitsio
-      - gsl
-      - libmatio
-      - orc
-      - little-cms2
-      - poppler
-      - librsvg
-      - openexr
-      - pango
+      - fftw
+      - giflib
+      - glib
+      - gobject-introspection
+      - gtk-doc
+      - libexif
       - libgsf
+      - libheif
+      - libjpeg-turbo
+      - libmatio
+      - librsvg
+      - libspng
+      - libtiff
+      - little-cms2
+      - openexr
       - openslide
+      - orc
+      - pango
+      - poppler
+      - webp
 
 jobs:
   allow_failures:
@@ -71,7 +74,7 @@ jobs:
     - os: linux
       dist: bionic
       compiler: gcc
-      name: "Ubuntu 18.04 / GCC 10"
+      name: "Linux x64 (Ubuntu 18.04) - GCC 10"
       addons:
         apt:
           sources:
@@ -93,7 +96,7 @@ jobs:
     - os: linux
       dist: bionic
       compiler: clang
-      name: "Ubuntu 18.04 / Clang 10 with ASan and UBSan"
+      name: "Linux x64 (Ubuntu 18.04) - Clang 10 with ASan and UBSan"
       addons:
         apt:
           sources:
@@ -128,16 +131,16 @@ jobs:
       cache: ccache
     - os: osx
       osx_image: xcode11
-      name: "macOS 10.14.6 / GCC 9"
+      name: "macOS (10.14.6) - Xcode 11"
       env:
         - JPEG=/usr/local/opt/jpeg-turbo
         - JOBS="`sysctl -n hw.ncpu`"
-        - WITH_MAGICK=yes
+        - WITH_MAGICK=no
         - PATH="/usr/local/opt/ccache/libexec:$PATH"
         - PKG_CONFIG_PATH="/usr/local/opt/jpeg-turbo/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:$PKG_CONFIG_PATH"
         - HOMEBREW_NO_AUTO_UPDATE=1
-        - CC="gcc-9"
-        - CXX="g++-9"
+        - CC="clang"
+        - CXX="clang++"
       cache: ccache
 
 install: