fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Bump libwayland to 1.24.0

Browse source 
This is required to update Weston.  This also requires that we start
building the scanner from source since libwayland 1.24 also requires
libwayland-scanner 1.24 which means there's no point in installing the
libwayland dev packages.

Reviewed-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36026>
This commit is contained in:
Faith Ekstrand 2025-07-09 11:41:31 -04:00 • committed by Marge Bot
parent d45f375a9d
commit 6ae92e791b
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci/container/build-wayland.sh
View file

@ -15,13 +15,20 @@ uncollapsed_section_start wayland "Building Wayland"
# DEBIAN_TEST_VK_TAG
# FEDORA_X86_64_BUILD_TAG
export LIBWAYLAND_VERSION="1.21.0"
export LIBWAYLAND_VERSION="1.24.0"
export WAYLAND_PROTOCOLS_VERSION="1.41"
git clone https://gitlab.freedesktop.org/wayland/wayland
cd wayland
git checkout "$LIBWAYLAND_VERSION"
meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build ${EXTRA_MESON_ARGS:-}
# Build the scanner first in case we're a cross build
# Note the lack of EXTRA_MESON_ARGS here. This is always a native build
meson setup -Dtests=false -Ddocumentation=false -Ddtd_validation=false -Dlibraries=false -Dscanner=true _scanner
meson install -C _scanner
# Now build libwayland using the given scanner
meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true -Dscanner=false _build ${EXTRA_MESON_ARGS:-}
meson install -C _build
cd ..
rm -rf wayland

1
.gitlab-ci/container/cross_build.sh
View file

@ -39,7 +39,6 @@ DEPS=(
"libxrandr-dev:$arch"
"libxshmfence-dev:$arch"
"libxxf86vm-dev:$arch"
"libwayland-dev:$arch"
)
dpkg --add-architecture $arch

1
.gitlab-ci/container/debian/test-base.sh
View file

@ -56,7 +56,6 @@ EPHEMERAL=(
libvulkan-dev
libudev-dev
libwaffle-dev
libwayland-dev
libx11-xcb-dev
libxcb-dri2-0-dev
libxcb-dri3-dev

14
.gitlab-ci/image-tags.yml
View file

@ -19,20 +19,20 @@ include:
- .gitlab-ci/conditional-build-image-tags.yml
variables:
DEBIAN_BASE_TAG: "20250618-crosvmvirgl"
DEBIAN_BASE_TAG: "20250709-libwayland"
DEBIAN_BUILD_TAG: "20250611-rust"
DEBIAN_BUILD_TAG: "20250710-libwayland"
DEBIAN_TEST_ANDROID_TAG: "20250701-cuttlefish"
DEBIAN_TEST_GL_TAG: "20250616-vkcts-main"
DEBIAN_TEST_ANDROID_TAG: "20250709-libwayland"
DEBIAN_TEST_GL_TAG: "20250709-libwayland"
DEBIAN_TEST_VIDEO_TAG: "20250609-helper"
DEBIAN_TEST_VK_TAG: "20250619-vkd3d"
DEBIAN_TEST_VK_TAG: "20250709-libwayland"
ALPINE_X86_64_BUILD_TAG: "20250611-rust"
ALPINE_X86_64_BUILD_TAG: "20250709-libwayland"
ALPINE_X86_64_LAVA_SSH_TAG: "20250423-rootfs"
ALPINE_X86_64_LAVA_TRIGGER_TAG: "20250619-cts-ovl"
FEDORA_X86_64_BUILD_TAG: "20250611-rust"
FEDORA_X86_64_BUILD_TAG: "20250709-libwayland"
KERNEL_TAG: "v6.14-mesa-4277"
KERNEL_REPO: "gfx-ci/linux"