xserver: Branch 'master' - 2 commits

[Adam Jackson]

 .travis.yml                       |    2 +-
 test/scripts/build-travis-deps.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e8f190b445ae10b12896ee396cd8d57f6b6b8cc4
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 4 13:19:01 2017 -0700

    travis: Request a new docker image with xkb-data and xkbcomp installed.
    
    Xvfb was erroring out with:
    
    XKB: Failed to compile keymap
    Keyboard initialization failed. This could be a missing or incorrect
    setup of xkeyboard-config.
    (EE) Fatal server error:
    (EE) Failed to activate virtual core keyboard: 2(EE)
    
    With this change, we can now run my xsync regression test on Travis.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/.travis.yml b/.travis.yml
index 00d7a485a..edeed0d90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ 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:v4 > Dockerfile ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM anholt/xserver-travis:v6 > Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
 
commit b62e486c4e3d7411f3e70b610af7f8b9dd5e8a73
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug 4 13:19:00 2017 -0700

    travis: Set prefix to /usr, so we find xkbcomp.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Eric Anholt <eric at anholt.net>

diff --git a/test/scripts/build-travis-deps.sh b/test/scripts/build-travis-deps.sh
index 213b51f6f..b87c65d3e 100755
--- a/test/scripts/build-travis-deps.sh
+++ b/test/scripts/build-travis-deps.sh
@@ -7,6 +7,6 @@ export XTEST_DIR=$TRAVIS_BUILD_DIR/xtest
 
 set -e
 
-meson build/
+meson --prefix=/usr build/
 ninja -C build/ install
 ninja -C build/ test