From 4adb93a448e701a9df13941c13da8bb92e778302 Mon Sep 17 00:00:00 2001
From: Jon Lund Steffensen <jonlst@gmail.com>
Date: Wed, 16 Aug 2017 17:58:30 -0700
Subject: Remove deprecated geoclue 1 location provider

---
 .travis.yml | 51 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 37 insertions(+), 14 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 18e0e81..8a060f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,38 @@
-dist: trusty
-sudo: required
+
 language: c
-before_install:
-  - sed -i -e 's|AC_PREREQ(\[2.69\])|AC_PREREQ([2.68])|' configure.ac
-  - sudo apt-get update -qq
-install:
-  - sudo apt-get install -qq autopoint intltool
-  - sudo apt-get install -qq libdrm-dev
-  - sudo apt-get install -qq libxcb1-dev libxcb-randr0-dev
-  - sudo apt-get install -qq libx11-dev libxxf86vm-dev
-  - sudo apt-get install -qq libgeoclue-dev
-  - sudo apt-get install -qq libglib2.0-dev
-  - sudo apt-get install -qq python3
-script: ./bootstrap && ./configure --enable-drm --enable-vidmode --enable-randr --enable-geoclue --enable-geoclue2 --enable-gui && make -j2 distcheck
+
+matrix:
+  include:
+    - os: linux
+      compiler: gcc
+      dist: trusty
+      sudo: false
+#    - os: osx
+#      compiler: clang
+
+addons:
+  apt:
+    packages:
+      - autopoint
+      - intltool
+      # DRM
+      - libdrm-dev
+      # RANDR
+      - libxcb1-dev
+      - libxcb-randr0-dev
+      # VidMode
+      - libx11-dev
+      - libxxf86vm-dev
+      # GeoClue2
+      - libglib2.0-dev
+      # GUI
+      - python3
+
+install: |
+  if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+    brew install gettext
+    brew install intltool
+  fi
+
+script: |
+  ./bootstrap && ./configure --enable-drm --enable-vidmode --enable-randr --enable-geoclue2 --enable-gui && make -j2 distcheck
-- 
cgit v1.2.3-70-g09d2