diff options
| author | Erik Kurzinger <ekurzinger@nvidia.com> | 2024-03-26 09:53:17 -0700 |
|---|---|---|
| committer | Olivier Fourdan <fourdan@gmail.com> | 2024-04-09 06:11:03 +0000 |
| commit | e00e7205c94be530a008d8122472c882b9382eb8 (patch) | |
| tree | bbacb55f8e4b15eaac99f9443adb7d54169dd94e /.gitlab-ci | |
| parent | d411a8b611aab57b2ac068928ddc09bef2b2a097 (diff) | |
Update CI for Xwayland explicit sync
Explicit sync support for Xwayland requires several updates to the
Debian CI image. These include...
xorgproto 2024.1 for DRI3 1.4 and Present 1.4
wayland-protocols 1.34 for wp-linux-drm-syncobj-v1
libdrm 2.4.116 for drmSyncobjEventfd
linux-libc-dev from bullseye-backports for DMA_BUF_IOCTL_IMPORT/EXPORT_SYNC_FD
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/967>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/cross-prereqs-build.sh | 2 | ||||
| -rw-r--r-- | .gitlab-ci/debian-install.sh | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/.gitlab-ci/cross-prereqs-build.sh b/.gitlab-ci/cross-prereqs-build.sh index dabc041ed..916d95a3d 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-2023.2' '--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/proto/xcbproto.git' 'xcb-proto-1.14.1' 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 0ff294a7b..59bcea4b0 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -15,6 +15,10 @@ EPHEMERAL=" xvfb " +# Add bullseye-backports for the newer linux-libc-dev package +echo 'deb http://deb.debian.org/debian bullseye-backports main' >> /etc/apt/sources.list +apt update + apt-get install -y \ $EPHEMERAL \ autoconf \ @@ -93,6 +97,7 @@ apt-get install -y \ libxtst-dev \ libxv-dev \ libz-mingw-w64-dev \ + linux-libc-dev/bullseye-backports \ mesa-common-dev \ meson \ mingw-w64-tools \ @@ -114,8 +119,8 @@ apt-get install -y \ cd /root -# Xwayland requires drm 2.4.109 for drmGetDeviceFromDevId -git clone https://gitlab.freedesktop.org/mesa/drm --depth 1 --branch=libdrm-2.4.109 +# Xwayland requires drm 2.4.116 for drmSyncobjEventfd +git clone https://gitlab.freedesktop.org/mesa/drm --depth 1 --branch=libdrm-2.4.116 cd drm meson _build ninja -C _build -j${FDO_CI_CONCURRENT:-4} install @@ -130,8 +135,8 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf libxcvt -# xserver requires xorgproto >= 2023.2 for XWAYLAND -git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2023.2 +# xserver requires xorgproto >= 2024.1 for XWAYLAND +git clone https://gitlab.freedesktop.org/xorg/proto/xorgproto.git --depth 1 --branch=xorgproto-2024.1 pushd xorgproto ./autogen.sh make -j${FDO_CI_CONCURRENT:-4} install @@ -146,8 +151,8 @@ ninja -C _build -j${FDO_CI_CONCURRENT:-4} install cd .. rm -rf wayland -# Xwayland requires wayland-protocols >= 1.30, but Debian bullseye has 1.20 only -git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.30 +# Xwayland requires wayland-protocols >= 1.34, but Debian bullseye has 1.20 only +git clone https://gitlab.freedesktop.org/wayland/wayland-protocols.git --depth 1 --branch=1.34 cd wayland-protocols meson _build ninja -C _build -j${FDO_CI_CONCURRENT:-4} install |