From 727507eb31d7206884b7c8c7f8bdd2adfd81b005 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Fri, 13 May 2022 11:21:51 +0200
Subject: [PATCH] ci: add libdecor
Add libdecor 0.1.0 to CI.
v2: Build with and without libdecor
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
.gitlab-ci.yml | 8 +++++++-
.gitlab-ci/debian-install.sh | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7851fbf7b..15be58bec1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
FDO_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-10-22"
+ FDO_DISTRIBUTION_TAG: "2022-05-04.1"
include:
- project: 'freedesktop/ci-templates'
@@ -73,6 +73,12 @@ meson-noglamor:
MESON_EXTRA_OPTIONS: >
-Dglamor=false
+meson-nolibdecor:
+ extends: meson
+ variables:
+ MESON_EXTRA_OPTIONS: >
+ -Dlibdecor=false
+
mingw-cross-build:
extends: .common-build-and-test
script:
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 89ca49e14e..e931c67909 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -32,6 +32,7 @@ apt-get install -y \
libaudit-dev \
libbsd-dev \
libcairo2 \
+ libcairo2-dev \
libdbus-1-dev \
libdmx-dev \
libdrm-dev \
@@ -47,6 +48,8 @@ apt-get install -y \
libglx-mesa0 \
libinput10 \
libnvidia-egl-wayland-dev \
+ libpango1.0-0 \
+ libpango1.0-dev \
libpciaccess-dev \
libpixman-1-dev \
libselinux1-dev \
@@ -151,6 +154,14 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
cd ..
rm -rf weston
+# Install libdecor for Xwayland
+git clone https://gitlab.gnome.org/jadahl/libdecor.git --depth 1 --branch=0.1.0
+cd libdecor
+meson _build -D{demo,install_demo}=false
+ninja -C _build -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf libdecor
+
git clone https://gitlab.freedesktop.org/mesa/piglit.git --depth 1
git clone https://gitlab.freedesktop.org/xorg/test/xts --depth 1
--
GitLab