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

(nomerge): ci: build xcb from our own branch 

Temporary workaround, until XCB fix is merged.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-14 11:42:59 +02:00
parent 66d7dbed01
commit 6dcb6bb77c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ variables:
FDO_UPSTREAM_REPO: xorg/xserver FDO_UPSTREAM_REPO: xorg/xserver
FDO_DISTRIBUTION_VERSION: bullseye-slim FDO_DISTRIBUTION_VERSION: bullseye-slim
FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' 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-xcb-1"
MESON_BUILDDIR: "build" MESON_BUILDDIR: "build"
include: include:

2
.gitlab-ci/cross-prereqs-build.sh
View File

@ -51,7 +51,7 @@ build 'https://gitlab.freedesktop.org/xorg/lib/pthread-stubs.git' '0.4'
# these would add -I/usr/include to CFLAGS, which breaks cross-compilation # 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' 'master' '--datadir=/lib'
build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9' 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/metux/xcbproto.git' 'master'
build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'master' build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'master'
build 'https://gitlab.freedesktop.org/xorg/lib/libxtrans.git' 'xtrans-1.4.0' 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 # the default value of keysymdefdir is taken from the includedir variable for

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

@ -116,7 +116,7 @@ apt-get install -y \
xutils-dev xutils-dev
# Xnest requires xcb bugfix # Xnest requires xcb bugfix
git clone https://gitlab.freedesktop.org/xorg/proto/xcbproto.git --depth 1 --branch=master git clone https://gitlab.freedesktop.org/metux/xcbproto.git --depth 1 --branch=master
( cd xcbproto && ./autogen.sh --prefix=/usr && make && make install ) ( cd xcbproto && ./autogen.sh --prefix=/usr && make && make install )
rm -Rf xcbproto rm -Rf xcbproto