xserver: Branch 'master' - 3 commits

[Adam Jackson]

 .travis.yml                                |   15 +++++++++++++++
 hw/xfree86/drivers/modesetting/meson.build |    2 +-
 test/scripts/build-travis-deps.sh          |   12 ++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

New commits:
commit d82c3cee02a99cf7861d1effaa5c7d38683a7783
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 1 13:59:54 2017 -0700

    travis: Enable ccache.
    
    We bind-mount the cache directory into the container.  Cuts build time
    from about 4 minutes to 2.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/.travis.yml b/.travis.yml
index d7379ab78..00d7a485a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 language: c
+cache: ccache
 dist: trusty
 services: docker
 
@@ -6,9 +7,9 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull anholt/xserver-travis ; fi
 
 before_script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v3 > Dockerfile ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v4 > Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
 
 script:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
commit 01dfb65ee2e34148718d3f95dfd4629024edba84
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 1 12:29:12 2017 -0700

    travis: Add a build script for Travis CI.
    
    This currently does a meson build using a docker image I've prepared.
    The Dockerfile source is at:
    
        https://github.com/anholt/xserver-travis
    
    Docker proved to be necessary to cut the build time per Travis push.
    If some day we end up using meson in more of the X stack, we may be
    able to move more dependencies out of the docker image and into the CI
    build (putting the I in CI).  Until then, we'll have to do docker
    image rebuilds when dependencies are added/updated.
    
    To enable Travis CI on your github repository, see the first two steps
    of the docs at:
    
        https://docs.travis-ci.com/user/getting-started/
    
    Once you do that, pushing branches to your github repo will trigger
    builds, which will send you email if they fail.  Current build status
    can be veiewed your account on travis-ci.org:
    
        https://travis-ci.org/anholt/xserver

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..d7379ab78
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: c
+dist: trusty
+services: docker
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull anholt/xserver-travis ; fi
+
+before_script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v3 > Dockerfile ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
+
+script:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && ./test/scripts/build-travis-deps.sh" ; fi
diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
new file mode 100755
index 000000000..213b51f6f
--- /dev/null
+++ b/test/scripts/build-travis-deps.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+export PREFIX=/usr
+export TRAVIS_BUILD_DIR=/root
+export PIGLIT_DIR=$TRAVIS_BUILD_DIR/piglit
+export XTEST_DIR=$TRAVIS_BUILD_DIR/xtest
+
+set -e
+
+meson build/
+ninja -C build/ install
+ninja -C build/ test
commit fda2b064a0ebd223e8a39fd19f5c5ad1da0776e8
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Jun 1 12:29:11 2017 -0700

    meson: Fix test for whether we've built glamor-EGL.
    
    This matches the test we use for going into the glamor_egl subdir in
    ../../meson.build.

diff --git a/hw/xfree86/drivers/modesetting/meson.build b/hw/xfree86/drivers/modesetting/meson.build
index ab3227605..c1546f62d 100644
--- a/hw/xfree86/drivers/modesetting/meson.build
+++ b/hw/xfree86/drivers/modesetting/meson.build
@@ -31,7 +31,7 @@ symbol_test_args = []
 symbol_test_args += join_paths(xorg_build_root, 'libxorgserver.so')
 symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libfb.so')
 symbol_test_args += join_paths(xorg_build_root, 'dixmods', 'libshadow.so')
-if build_glamor
+if gbm_dep.found()
     symbol_test_args += join_paths(xorg_build_root, 'glamor_egl', 'libglamoregl.so')
 endif
 symbol_test_args += join_paths(xorg_build_root, 'drivers', 'modesetting', 'modesetting_drv.so')