frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: update libdecor from 0.1.0 to 0.1.1 

The install_demo meson_option was added in
libdecor/libdecor@7106f5e329
which is in the 0.1.1 tag, but not 0.1.0.

If we upgrade the version of meson used in the CI to 1.0.0, then it fails
to build libdecor 0.1.0 with: ERROR: Unknown options: "install_demo"

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1668>
This commit is contained in:
Alan Coopersmith 2024-09-07 15:06:03 -07:00 committed by Enrico Weigelt, metux IT consult
parent 66eba48b3f
commit 3efc812a06
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/debian-install.sh
View File

@ -160,7 +160,7 @@ cd ..
rm -rf wayland-protocols rm -rf wayland-protocols
# Install libdecor for Xwayland # Install libdecor for Xwayland
git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.0 git clone https://gitlab.freedesktop.org/libdecor/libdecor.git --depth 1 --branch=0.1.1
cd libdecor cd libdecor
meson _build -D{demo,install_demo}=false meson _build -D{demo,install_demo}=false
ninja -C _build -j${FDO_CI_CONCURRENT:-4} install ninja -C _build -j${FDO_CI_CONCURRENT:-4} install