From cdef622a0a2ba95302a5b21bdeed99a95dbc8347 Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.com>
Date: Tue, 15 Oct 2024 05:44:23 -0500
Subject: [PATCH] meson: Update wayland-protocols to 1.38

Update the wrap and the dependency, as well as bumping several build tags.

I've also turned off wayland-protocols tests, as we don't want to bump the
wayland-scanner version at this time.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26150>
---
 .gitlab-ci/container/build-wayland.sh |  4 ++--
 .gitlab-ci/image-tags.yml             | 18 +++++++++---------
 meson.build                           |  2 +-
 subprojects/wayland-protocols.wrap    |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci/container/build-wayland.sh b/.gitlab-ci/container/build-wayland.sh
index de08c308188..97e1f939c79 100644
--- a/.gitlab-ci/container/build-wayland.sh
+++ b/.gitlab-ci/container/build-wayland.sh
@@ -13,7 +13,7 @@ set -uex
 # KERNEL_ROOTFS_TAG
 
 export LIBWAYLAND_VERSION="1.21.0"
-export WAYLAND_PROTOCOLS_VERSION="1.34"
+export WAYLAND_PROTOCOLS_VERSION="1.38"
 
 git clone https://gitlab.freedesktop.org/wayland/wayland
 cd wayland
@@ -26,7 +26,7 @@ rm -rf wayland
 git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
 cd wayland-protocols
 git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson setup _build ${EXTRA_MESON_ARGS:-}
+meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-}
 meson install -C _build
 cd ..
 rm -rf wayland-protocols
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 6a647e6c8b8..cfcc5dce263 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: "20241022-mouldy"
+   DEBIAN_BASE_TAG: "20241106-wlproto2"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240910-SDK614"
+   DEBIAN_BUILD_TAG: "20241106-wlproto2"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -27,17 +27,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: "20241022-delete-mesa"
-   DEBIAN_TEST_GL_TAG: "20241030-piglit-c2"
-   DEBIAN_TEST_VK_TAG: "20241030-piglit-c2"
-   KERNEL_ROOTFS_TAG: "20241030-piglit-c2"
+   DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2"
+   DEBIAN_TEST_GL_TAG: "20241106-wlproto2"
+   DEBIAN_TEST_VK_TAG: "20241106-wlproto2"
+   KERNEL_ROOTFS_TAG: "20241106-wlproto2"
 
    DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
    DEBIAN_PYUTILS_TAG: "20241002-pyutils"
 
-   ALPINE_X86_64_BUILD_TAG: "20241018-no-selinux"
-   ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto"
-   FEDORA_X86_64_BUILD_TAG: "20241018-no-selinux"
+   ALPINE_X86_64_BUILD_TAG: "20241106-wlproto2"
+   ALPINE_X86_64_LAVA_SSH_TAG: "20241106-wlproto2"
+   FEDORA_X86_64_BUILD_TAG: "20241106-wlproto2"
    KERNEL_TAG: "v6.6.21-mesa-f8ea"
    KERNEL_REPO: "gfx-ci/linux"
    PKG_REPO_REV: "bca9635d"
diff --git a/meson.build b/meson.build
index 0496aaba50d..6d3db2c6667 100644
--- a/meson.build
+++ b/meson.build
@@ -2019,7 +2019,7 @@ if with_platform_wayland
   else
     wl_scanner_arg = 'code'
   endif
-  dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.34')
+  dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.38')
   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 296a63f6bc5..61f306bdffd 100644
--- a/subprojects/wayland-protocols.wrap
+++ b/subprojects/wayland-protocols.wrap
@@ -1,8 +1,8 @@
 [wrap-file]
-directory = wayland-protocols-1.34
-source_url = https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/1.34/downloads/wayland-protocols-1.34.tar.xz
-source_filename = wayland-protocols-1.34.tar.xz
-source_hash = c59b27cacd85f60baf4ee5f80df5c0d15760ead6a2432b00ab7e2e0574dcafeb
+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
+source_hash = ff17292c05159d2b20ce6cacfe42d7e31a28198fa1429a769b03af7c38581dbe
 
 [provide]
 wayland-protocols = wayland_protocols