diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2022-09-27 15:09:12 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2022-09-27 16:11:57 +0300 |
commit | f3a46e2fd93f3fcd13e785b2156b71d4f9618914 (patch) | |
tree | 41856f2bf10d8861f8d720f5858127e85e01f613 /build_files/build_environment/cmake | |
parent | 0084b8635f7502cce9df242c20c580f4a7b6fc2f (diff) |
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".
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 3 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/wayland.cmake | 3 |
3 files changed, 4 insertions, 4 deletions
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 ) |