gitlab CI: install xorgproto from git before building the Xserver

Xserver git is now failing to build due to:
Dependency presentproto found: NO found 1.3 but need: '>= 1.4'

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/12>
This commit is contained in:
Alan Coopersmith
2024-05-03 12:19:09 -07:00
parent 627e12a35c
commit fbde5bf53c

View File

@@ -101,11 +101,17 @@ build:
# We don't want any failed commands to exit our script until VM
# cleanup has been completed.
- set +e
# First we need to build and install the Xorg server to get the SDK headers
# First we need to install the latest xorgproto needed to build Xserver
- |
/app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
/app/vmctl exec "mkdir xorgproto/_builddir"
/app/vmctl exec "cd xorgproto/_builddir && meson setup"
/app/vmctl exec "cd xorgproto/_builddir && ninja install"
# Then we need to build and install the Xorg server to get the SDK headers
- |
/app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/xserver.git"
/app/vmctl exec "mkdir xserver/_builddir"
/app/vmctl exec "cd xserver/_builddir && meson setup $XSERVER_MESON_FLAGS"
/app/vmctl exec "cd xserver/_builddir && env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig meson setup $XSERVER_MESON_FLAGS"
/app/vmctl exec "cd xserver/_builddir && ninja"
/app/vmctl exec "cd xserver/_builddir && ninja install"
# Now build this driver