xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 .gitlab-ci.yml               |    9 +++------
 .gitlab-ci/debian-install.sh |   11 +++++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit f08ab719df921e1269691553daf56853380fb241
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Thu Dec 17 18:58:28 2020 +0100

    ci: Test ninja dist in meson jobs
    
    While this isn't critical yet, it might become so at some point, so
    let's make sure it keeps working.
    
    Don't set the PIGLIT/XTEST_DIR variables for ninja dist, testing XTS
    once against each DDX is enough (as part of ninja test).
    
    Requires git in the docker image.
    
    v2:
    * Drop /usr/local/bin/xkbcomp symlink, no longer needed with xkbcomp
      1.4.1 (Peter Hutterer)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0b4166c8..35d347411 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
     UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: buster-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: "2021-01-19-xkbcomp"
+    FDO_DISTRIBUTION_TAG: "2021-01-19-git"
 
 include:
   - project: 'freedesktop/ci-templates'
@@ -72,13 +72,10 @@ autotools:
 
 meson:
     extends: .common-build-and-test
-    variables:
-        PIGLIT_DIR: /root/piglit
-        XTEST_DIR: /root/xts
     script:
         - meson -Dc_args="-fno-common" -Dprefix=/usr -Dxephyr=true -Dwerror=true $MESON_EXTRA_OPTIONS build/
-        - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ install
-        - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test
+        - ninja -j${FDO_CI_CONCURRENT:-4} -C build/ dist
+        - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts ninja -j${FDO_CI_CONCURRENT:-4} -C build/ test
         - .gitlab-ci/manpages-check
 
 meson-noglamor:
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 9426d09cd..cd32acba7 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -5,7 +5,6 @@ set -o xtrace
 
 # Packages which are needed by this script, but not for the xserver build
 EPHEMERAL="
-	git
 	libcairo2-dev
 	libevdev-dev
 	libexpat-dev
@@ -27,6 +26,7 @@ apt-get install -y \
 	ca-certificates \
 	ccache \
 	flex \
+	git \
 	libaudit-dev \
 	libbsd-dev \
 	libcairo2 \
commit 099eb6261cfb4a7a674ead467a8a9dfb2ee173d8
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Fri Jan 15 18:32:30 2021 +0100

    ci: Build xkbcomp 1.4.1 for the docker image
    
    This is a requirement for testing meson dist in CI.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fecb63fda..e0b4166c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
     UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: buster-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: "2020-11-16"
+    FDO_DISTRIBUTION_TAG: "2021-01-19-xkbcomp"
 
 include:
   - project: 'freedesktop/ci-templates'
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 07f09388a..9426d09cd 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -94,7 +94,6 @@ apt-get install -y \
 	python3-mako \
 	python3-numpy \
 	python3-six \
-	x11-xkb-utils \
 	x11proto-dev \
 	xfonts-utils \
 	xkb-data \
@@ -153,6 +152,14 @@ echo 'path=/root/xts' >> piglit/piglit.conf
 find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
 strip xts/xts5/*/.libs/*
 
+# Running meson dist requires xkbcomp 1.4.1 or newer, but Debian buster has 1.4.0 only
+git clone https://gitlab.freedesktop.org/xorg/app/xkbcomp.git --depth 1 --branch=xkbcomp-1.4.1
+cd xkbcomp
+./autogen.sh --datarootdir=/usr/share
+make -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf xkbcomp
+
 apt-get purge -y \
 	$EPHEMERAL