From f73f8ccb60e326fd2821aa458b7a7f91740e6346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 26 Feb 2025 09:57:07 +0100 Subject: [PATCH] ci: Install XCB dependencies for meson tests The lack of these prevented some of the tests from running in CI. --- .gitlab-ci.yml | 2 +- .gitlab-ci/debian-install.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25224673e..707deebb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,7 @@ variables: REPO_URL_XORGPROTO: 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' XORG_DEBIAN_VERSION: 'bullseye-slim' XORG_DEBIAN_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - XORG_DEBIAN_TAG: '2025-02-12-xts' + XORG_DEBIAN_TAG: '2025-02-26-xcb-deps' XORG_FREEBSD_VERSION: '14.2' XORG_FREEBSD_EXEC: '' XORG_FREEBSD_TAG: '2025-02-18-vm-image' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index a3d3c29d4..e4f1eb6e2 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -65,6 +65,7 @@ apt-get install -y \ libx11-xcb-dev \ libxau-dev \ libxaw7-dev \ + libxcb-damage0-dev \ libxcb-dri2-0-dev \ libxcb-dri3-dev \ libxcb-glx0-dev \ @@ -76,8 +77,10 @@ apt-get install -y \ libxcb-render0-dev \ libxcb-shape0-dev \ libxcb-shm0-dev \ + libxcb-sync-dev \ libxcb-util0-dev \ libxcb-xf86dri0-dev \ + libxcb-xinput-dev \ libxcb-xkb-dev \ libxcb-xv0-dev \ libxcb1-dev \