[Bf-blender-cvs] [dd6f7c13181] master: Build: remove patch to build with older meson version for Wayland
Campbell Barton
noreply at git.blender.org
Tue Dec 13 02:36:24 CET 2022
Commit: dd6f7c131818b12b44e5603427ea3c3438898eaf
Author: Campbell Barton
Date: Tue Dec 13 11:22:05 2022 +1100
Branches: master
https://developer.blender.org/rBdd6f7c131818b12b44e5603427ea3c3438898eaf
Build: remove patch to build with older meson version for Wayland
Revert part of [0] which was required to build with meson 0.55.1,
rocky8 has version 0.58.2.
[0]; 8bb084cda3c9079ddb55288bd03b0a10df88bf59
===================================================================
M build_files/build_environment/cmake/wayland.cmake
D build_files/build_environment/patches/wayland.diff
===================================================================
diff --git a/build_files/build_environment/cmake/wayland.cmake b/build_files/build_environment/cmake/wayland.cmake
index 76fbbcf3f97..ab573a8dca9 100644
--- a/build_files/build_environment/cmake/wayland.cmake
+++ b/build_files/build_environment/cmake/wayland.cmake
@@ -5,7 +5,6 @@ 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 & LIBXML2.
#
# NOTE: passing link args "ffi/lib" should not be needed, but
diff --git a/build_files/build_environment/patches/wayland.diff b/build_files/build_environment/patches/wayland.diff
deleted file mode 100644
index c080b7b2964..00000000000
--- a/build_files/build_environment/patches/wayland.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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',
More information about the Bf-blender-cvs
mailing list