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

Revert "ci: build on xcbproto/libxcb master" 

This reverts commit 026815ebac5f3117def7156f375cdbe31c657585.
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-26 13:31:12 +02:00
parent 3a26b575b5
commit 0843fc86ac
3 changed files with 4 additions and 13 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-fix-cross"
MESON_BUILDDIR: "build" MESON_BUILDDIR: "build"
include: include:

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

@ -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' 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 # 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 # 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/lib/libXau.git' 'libXau-1.0.9'
build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.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' 'master' 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' 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
# xproto, which isn't adjusted by pkg-config for the sysroot # xproto, which isn't adjusted by pkg-config for the sysroot

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

@ -115,15 +115,6 @@ apt-get install -y \
xtrans-dev \ xtrans-dev \
xutils-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 .gitlab-ci/cross-prereqs-build.sh i686-w64-mingw32
cd /root cd /root