mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 10:14:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

meson: Update wayland-protocols to 1.38

Browse Source 
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>
This commit is contained in:
Derek Foreman 2024-10-15 05:44:23 -05:00 committed by Marge Bot
parent c108dfc930
commit cdef622a0a
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/container/build-wayland.sh
View File

@ -13,7 +13,7 @@ set -uex
# KERNEL_ROOTFS_TAG # KERNEL_ROOTFS_TAG
export LIBWAYLAND_VERSION="1.21.0" 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 git clone https://gitlab.freedesktop.org/wayland/wayland
cd wayland cd wayland
@ -26,7 +26,7 @@ rm -rf wayland
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
cd wayland-protocols cd wayland-protocols
git checkout "$WAYLAND_PROTOCOLS_VERSION" git checkout "$WAYLAND_PROTOCOLS_VERSION"
meson setup _build ${EXTRA_MESON_ARGS:-} meson setup -Dtests=false _build ${EXTRA_MESON_ARGS:-}
meson install -C _build meson install -C _build
cd .. cd ..
rm -rf wayland-protocols rm -rf wayland-protocols

18
.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: "20241022-mouldy" DEBIAN_BASE_TAG: "20241106-wlproto2"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" 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_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_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_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: "20241022-delete-mesa" DEBIAN_TEST_ANDROID_TAG: "20241106-wlproto2"
DEBIAN_TEST_GL_TAG: "20241030-piglit-c2" DEBIAN_TEST_GL_TAG: "20241106-wlproto2"
DEBIAN_TEST_VK_TAG: "20241030-piglit-c2" DEBIAN_TEST_VK_TAG: "20241106-wlproto2"
KERNEL_ROOTFS_TAG: "20241030-piglit-c2" KERNEL_ROOTFS_TAG: "20241106-wlproto2"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20241002-pyutils" DEBIAN_PYUTILS_TAG: "20241002-pyutils"
ALPINE_X86_64_BUILD_TAG: "20241018-no-selinux" ALPINE_X86_64_BUILD_TAG: "20241106-wlproto2"
ALPINE_X86_64_LAVA_SSH_TAG: "20240401-wlproto" ALPINE_X86_64_LAVA_SSH_TAG: "20241106-wlproto2"
FEDORA_X86_64_BUILD_TAG: "20241018-no-selinux" FEDORA_X86_64_BUILD_TAG: "20241106-wlproto2"
KERNEL_TAG: "v6.6.21-mesa-f8ea" KERNEL_TAG: "v6.6.21-mesa-f8ea"
KERNEL_REPO: "gfx-ci/linux" KERNEL_REPO: "gfx-ci/linux"
PKG_REPO_REV: "bca9635d" PKG_REPO_REV: "bca9635d"

2
meson.build
View File

@ -2019,7 +2019,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.34') dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.38')
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

8
subprojects/wayland-protocols.wrap
View File

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