From 0843fc86ac3ce71ce4c2af230debc7c0e3631403 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 26 Aug 2024 13:31:12 +0200 Subject: [PATCH] Revert "ci: build on xcbproto/libxcb master" This reverts commit 026815ebac5f3117def7156f375cdbe31c657585. --- .gitlab-ci.yml | 2 +- .gitlab-ci/cross-prereqs-build.sh | 6 +++--- .gitlab-ci/debian-install.sh | 9 --------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed410e14b..539230225 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ variables: FDO_UPSTREAM_REPO: xorg/xserver FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' - FDO_DISTRIBUTION_TAG: "2024-08-23-xcb-0" + FDO_DISTRIBUTION_TAG: "2024-08-23-fix-cross" MESON_BUILDDIR: "build" include: diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index a8b6e5424..8f567e10d 100755 --- a/.gitlab-ci/cross-prereqs-build.sh +++ b/.gitlab-ci/cross-prereqs-build.sh @@ -49,10 +49,10 @@ build 'https://gitlab.freedesktop.org/pixman/pixman.git' 'pixman-0.38.4' build 'https://gitlab.freedesktop.org/xorg/lib/pthread-stubs.git' '0.4' # we can't use the xorgproto pkgconfig files from /usr/share/pkgconfig, because # these would add -I/usr/include to CFLAGS, which breaks cross-compilation -build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'master' '--datadir=/lib' +build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'xorgproto-2024.1' '--datadir=/lib' build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9' -build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'master' -build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'master' +build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'xcb-proto-1.14.1' +build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14' build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0' # the default value of keysymdefdir is taken from the includedir variable for # xproto, which isn't adjusted by pkg-config for the sysroot diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 67e9b267f..59bcea4b0 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -115,15 +115,6 @@ apt-get install -y \ xtrans-dev \ xutils-dev -# Xnest requires xcb bugfix -git clone https://gitlab.freedesktop.org/xorg/proto/xcbproto.git --depth 1 --branch=master -( cd xcbproto && ./autogen.sh --prefix=/usr && make && make install ) -rm -Rf xcbproto - -git clone https://gitlab.freedesktop.org/xorg/lib/libxcb.git --depth 1 --branch=master -( cd libxcb && ./autogen.sh --prefix=/usr && make && make install ) -rm -Rf libxcb - .gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32 cd /root