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

increase required wayland-protocols version to 1.41

Browse source 
This version contains the color management protocol.

This commit also adjusts the build-wayland script to mention
that the DEBIAN_BASE_TAG also has to be bumped.

Signed-off-by: Xaver Hugl <xaver.hugl@kde.org>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32038>
This commit is contained in:
Xaver Hugl 2025-02-17 16:25:09 +01:00 • committed by Marge Bot
parent 9f40d06d2d
commit 53b40a40f4
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ uncollapsed_section_start wayland "Building Wayland"
# When changing this file, you need to bump the following # When changing this file, you need to bump the following
# .gitlab-ci/image-tags.yml tags: # .gitlab-ci/image-tags.yml tags:
# ALPINE_X86_64_BUILD_TAG # ALPINE_X86_64_BUILD_TAG
# DEBIAN_BASE_TAG
# DEBIAN_BUILD_TAG # DEBIAN_BUILD_TAG
# DEBIAN_TEST_ANDROID_TAG # DEBIAN_TEST_ANDROID_TAG
# DEBIAN_TEST_GL_TAG # DEBIAN_TEST_GL_TAG
@ -16,7 +17,7 @@ uncollapsed_section_start wayland "Building Wayland"
# KERNEL_ROOTFS_TAG # KERNEL_ROOTFS_TAG
export LIBWAYLAND_VERSION="1.21.0" export LIBWAYLAND_VERSION="1.21.0"
export WAYLAND_PROTOCOLS_VERSION="1.38" export WAYLAND_PROTOCOLS_VERSION="1.41"
git clone https://gitlab.freedesktop.org/wayland/wayland git clone https://gitlab.freedesktop.org/wayland/wayland
cd wayland cd wayland

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

@ -13,10 +13,10 @@
variables: variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20250220-kernel" DEBIAN_BASE_TAG: "20250223-way-prot"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20250210-android-drm" DEBIAN_BUILD_TAG: "20250223-way-prot"
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base" DEBIAN_ARM32_TEST_BASE_IMAGE: "debian/arm32_test-base"
@ -30,17 +30,17 @@ variables:
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" DEBIAN_TEST_ANDROID_TAG: "20250223-way-prot"
DEBIAN_TEST_GL_TAG: "20250221-piglit-04" DEBIAN_TEST_GL_TAG: "20250223-way-prot"
DEBIAN_TEST_VK_TAG: "20250221-piglit-04" DEBIAN_TEST_VK_TAG: "20250223-way-prot"
KERNEL_ROOTFS_TAG: "20250221-mtk-kernel" KERNEL_ROOTFS_TAG: "20250223-way-prot"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20250129-lavacli" DEBIAN_PYUTILS_TAG: "20250129-lavacli"
ALPINE_X86_64_BUILD_TAG: "20250221-wlproto" ALPINE_X86_64_BUILD_TAG: "20250223-way-prot"
ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools" ALPINE_X86_64_LAVA_SSH_TAG: "20250124-spirv-tools"
FEDORA_X86_64_BUILD_TAG: "20250128-llversionm" FEDORA_X86_64_BUILD_TAG: "20250223-way-prot"
KERNEL_TAG: "v6.13-rc4-mesa-50ca" KERNEL_TAG: "v6.13-rc4-mesa-50ca"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"

2
meson.build
View file

@ -2064,7 +2064,7 @@ if with_platform_wayland
else else
wl_scanner_arg = 'code' wl_scanner_arg = 'code'
endif endif
dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.38', default_options: [ 'tests=false' ]) dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.41', default_options: [ 'tests=false' ])
dep_wayland_client = dependency('wayland-client', version : '>=1.18') dep_wayland_client = dependency('wayland-client', version : '>=1.18')
dep_wayland_server = dependency('wayland-server', version : '>=1.18') dep_wayland_server = dependency('wayland-server', version : '>=1.18')
if with_egl if with_egl

6
subprojects/wayland-protocols.wrap
View file

@ -1,7 +1,7 @@
[wrap-file] [wrap-file]
directory = wayland-protocols-1.38 directory = wayland-protocols-1.41
source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.38/downloads/wayland-protocols-1.38.tar.xz source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.41/downloads/wayland-protocols-1.41.tar.xz
source_filename = wayland-protocols-1.38.tar.xz source_filename = wayland-protocols-1.41.tar.xz
source_hash = ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe source_hash = ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe
[provide] [provide]