From f3a46e2fd93f3fcd13e785b2156b71d4f9618914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Tue, 27 Sep 2022 14:09:12 +0200
Subject: Deps: fix builing wayland-scanner

- fix the source package download URL
- patch the `meson.build` file to allow the CentOS 7 meson version to be
  used
- only build what we need (`wayland-scanner`), and not the libraries,
  documentation, and tests.

Ref: D16074

This also reverts commit f6664217b3214be869afb732d1d5bfc471a88e9a
"Build: temporarily disable wayland dependency".
---
 build_files/build_environment/CMakeLists.txt       |  3 +--
 build_files/build_environment/cmake/harvest.cmake  |  3 +--
 build_files/build_environment/cmake/versions.cmake |  2 +-
 build_files/build_environment/cmake/wayland.cmake  |  3 ++-
 build_files/build_environment/patches/wayland.diff | 11 +++++++++++
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 build_files/build_environment/patches/wayland.diff

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index f44bb1cbf75..468a434b887 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -171,8 +171,7 @@ if(UNIX AND NOT APPLE)
   include(cmake/mesa.cmake)
   include(cmake/wayland_protocols.cmake)
   # Can be removed when the build-bot upgrades to v1.20.x or newer.
-  # DISABLED: (see D16074).
-  # include(cmake/wayland.cmake)
+  include(cmake/wayland.cmake)
 endif()
 
 include(cmake/harvest.cmake)
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 85c823309fb..6c920e651fe 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -117,8 +117,7 @@ else()
     harvest(xml2/lib xml2/lib "*.a")
 
     harvest(wayland-protocols/share/wayland-protocols wayland-protocols/share/wayland-protocols/ "*.xml")
-    # DISABLED: (see D16074).
-    # harvest(wayland/bin wayland/bin "wayland-scanner")
+    harvest(wayland/bin wayland/bin "wayland-scanner")
   else()
     harvest(blosc/lib openvdb/lib "*.a")
     harvest(xml2/lib opencollada/lib "*.a")
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index a6ff4628325..01996efa9bd 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -460,7 +460,7 @@ set(WL_PROTOCOLS_HASH_TYPE MD5)
 
 set(WAYLAND_VERSION 1.21.0)
 set(WAYLAND_FILE wayland-${WAYLAND_VERSION}.tar.xz)
-set(WAYLAND_URI https://wayland.freedesktop.org/releases/wayland-${WAYLAND_VERSION}.tar.xz)
+set(WAYLAND_URI https://gitlab.freedesktop.org/wayland/wayland/-/releases/1.21.0/downloads/wayland-${WAYLAND_VERSION}.tar.xz)
 set(WAYLAND_HASH f2653a2293bcd882d756c6a83d278903)
 set(WAYLAND_HASH_TYPE MD5)
 
diff --git a/build_files/build_environment/cmake/wayland.cmake b/build_files/build_environment/cmake/wayland.cmake
index 0f800b2e7eb..b1c1714fd15 100644
--- a/build_files/build_environment/cmake/wayland.cmake
+++ b/build_files/build_environment/cmake/wayland.cmake
@@ -5,9 +5,10 @@ ExternalProject_Add(external_wayland
   DOWNLOAD_DIR ${DOWNLOAD_DIR}
   URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH}
   PREFIX ${BUILD_DIR}/wayland
+  PATCH_COMMAND ${PATCH_CMD} -d ${BUILD_DIR}/wayland/src/external_wayland < ${PATCH_DIR}/wayland.diff
   # Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT.
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig
-                    meson --prefix ${LIBDIR}/wayland . ../external_wayland
+                    meson --prefix ${LIBDIR}/wayland -Ddocumentation=false -Dtests=false -Dlibraries=false . ../external_wayland
   BUILD_COMMAND ninja
   INSTALL_COMMAND ninja install
 )
diff --git a/build_files/build_environment/patches/wayland.diff b/build_files/build_environment/patches/wayland.diff
new file mode 100644
index 00000000000..c080b7b2964
--- /dev/null
+++ b/build_files/build_environment/patches/wayland.diff
@@ -0,0 +1,11 @@
+--- meson.build.orig	2022-06-30 22:59:11.000000000 +0100
++++ meson.build	2022-09-27 13:21:26.428517668 +0100
+@@ -2,7 +2,7 @@
+ 	'wayland', 'c',
+ 	version: '1.21.0',
+ 	license: 'MIT',
+-	meson_version: '>= 0.56.0',
++	meson_version: '>= 0.55.1',
+ 	default_options: [
+ 		'warning_level=2',
+ 		'buildtype=debugoptimized',
-- 
cgit v1.2.3