diff options
| author | Povilas Kanapickas <povilas@radix.lt> | 2021-05-30 13:26:28 +0300 |
|---|---|---|
| committer | Povilas Kanapickas <povilas@radix.lt> | 2021-05-30 13:26:28 +0300 |
| commit | 2acde60147797393e0ee9428cff0f74cdc0a9227 (patch) | |
| tree | a9c570ba54694410fc9ce6bed30e16a1cb992fff /.gitlab-ci | |
| parent | 236d1775509404b0dcf44873422dd8652b1e9588 (diff) | |
.gitlab-ci: Install xorgproto 2021.4.99.2 from git
This is required for the support of upcoming XI 2.4 protocol.
Signed-off-by: Povilas Kanapickas <povilas@radix.lt>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/cross-prereqs-build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index 3decf707b..4596667a1 100755 --- a/.gitlab-ci/cross-prereqs-build.sh +++ b/.gitlab-ci/cross-prereqs-build.sh @@ -49,7 +49,7 @@ 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' 'xorgproto-2019.1' '--datadir=/lib' +build 'https://gitlab.freedesktop.org/xorg/proto/xorgproto.git' 'xorgproto-2021.4.99.2' '--datadir=/lib' build 'https://gitlab.freedesktop.org/xorg/lib/libXau.git' 'libXau-1.0.9' build 'https://gitlab.freedesktop.org/xorg/proto/xcbproto.git' 'xcb-proto-1.14' build 'https://gitlab.freedesktop.org/xorg/lib/libxcb.git' 'libxcb-1.14' diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index 60d76c831..963533cda 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -98,7 +98,6 @@ apt-get install -y \ python3-mako \ python3-numpy \ python3-six \ - x11proto-dev \ xfonts-utils \ xkb-data \ xtrans-dev \ @@ -108,6 +107,14 @@ apt-get install -y \ cd /root +# xserver requires xorgproto >= 2021.4.99.2 for XI 2.3.99.1 +git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2021.4.99.2 +pushd xorgproto +./autogen.sh +make -j${FDO_CI_CONCURRENT:-4} install +popd +rm -rf xorgproto + # weston 9.0 requires libwayland >= 1.18 git clone https://gitlab.freedesktop.org/wayland/wayland.git --depth 1 --branch=1.18.0 cd wayland |