diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh index 446367bc8f6..551edcfe7db 100644 --- a/.gitlab-ci/container/build-wayland.sh +++ b/.gitlab-ci/container/build-wayland.sh @@ -8,6 +8,7 @@ uncollapsed_section_start wayland "Building Wayland" # When changing this file, you need to bump the following # .gitlab-ci/image-tags.yml tags: # ALPINE_X86_64_BUILD_TAG +# DEBIAN_BASE_TAG # DEBIAN_BUILD_TAG # DEBIAN_TEST_ANDROID_TAG # DEBIAN_TEST_GL_TAG @@ -16,7 +17,7 @@ uncollapsed_section_start wayland "Building Wayland" # KERNEL_ROOTFS_TAG 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 cd wayland diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index f24826e8928..743e4cf592f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,10 +13,10 @@ variables: 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_BUILD_TAG: "20250210-android-drm" + DEBIAN_BUILD_TAG: "20250223-way-prot" DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_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_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" - DEBIAN_TEST_GL_TAG: "20250221-piglit-04" - DEBIAN_TEST_VK_TAG: "20250221-piglit-04" - KERNEL_ROOTFS_TAG: "20250221-mtk-kernel" + DEBIAN_TEST_ANDROID_TAG: "20250223-way-prot" + DEBIAN_TEST_GL_TAG: "20250223-way-prot" + DEBIAN_TEST_VK_TAG: "20250223-way-prot" + KERNEL_ROOTFS_TAG: "20250223-way-prot" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" 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" - FEDORA_X86_64_BUILD_TAG: "20250128-llversionm" + FEDORA_X86_64_BUILD_TAG: "20250223-way-prot" KERNEL_TAG: "v6.13-rc4-mesa-50ca" KERNEL_REPO: "gfx-ci/linux" diff --git a/meson.build b/meson.build index dfae7eada45..24e174f61e9 100644 --- a/meson.build +++ b/meson.build @@ -2064,7 +2064,7 @@ if with_platform_wayland else wl_scanner_arg = 'code' 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_server = dependency('wayland-server', version : '>=1.18') if with_egl diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap index 61f306bdffd..c82fece01e3 100644 --- a/subprojects/wayland-protocols.wrap +++ b/subprojects/wayland-protocols.wrap @@ -1,7 +1,7 @@ [wrap-file] -directory = wayland-protocols-1.38 -source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.38/downloads/wayland-protocols-1.38.tar.xz -source_filename = wayland-protocols-1.38.tar.xz +directory = wayland-protocols-1.41 +source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.41/downloads/wayland-protocols-1.41.tar.xz +source_filename = wayland-protocols-1.41.tar.xz source_hash = ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe [provide]