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

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

This reverts commit 9ba28665b8fe418bccb0c1669b03149f7a1fbe2a.
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-26 13:30:40 +02:00
parent 6dcb6bb77c
commit 3a26b575b5
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_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-1"
FDO_DISTRIBUTION_TAG: "2024-08-23-xcb-0"
MESON_BUILDDIR: "build"
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
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/metux/xcbproto.git' 'master'
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/lib/libxtrans.git' 'xtrans-1.4.0'
# 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
# Xnest requires xcb bugfix
git clone https://gitlab.freedesktop.org/metux/xcbproto.git --depth 1 --branch=master
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