griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
66224d69b059ea7c7b88683a94d5b5e80fb1ad91
test2/build_files/build_environment/cmake/wayland.cmake

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

42 lines
1.1 KiB
CMake
Raw Normal View History

License Headers: Set copyright to "Blender Authors", add AUTHORS Listing the "Blender Foundation" as copyright holder implied the Blender Foundation holds copyright to files which may include work from many developers. While keeping copyright on headers makes sense for isolated libraries, Blender's own code may be refactored or moved between files in a way that makes the per file copyright holders less meaningful. Copyright references to the "Blender Foundation" have been replaced with "Blender Authors", with the exception of `./extern/` since these this contains libraries which are more isolated, any changed to license headers there can be handled on a case-by-case basis. Some directories in `./intern/` have also been excluded: - `./intern/cycles/` it's own `AUTHORS` file is planned. - `./intern/opensubdiv/`. An "AUTHORS" file has been added, using the chromium projects authors file as a template. Design task: #110784 Ref !110783.
2023-08-16 00:20:26 +10:00
# SPDX-FileCopyrightText: 2022-2023 Blender Authors
License headers: use SPDX-FileCopyrightText for CMake files
2023-06-14 22:49:59 +10:00
#
Build: add wayland to deps build This is needed to ensure and up to date "wayland-scanner" is used, as versions before 1.20.0 generate headers incompatible with dynamic linking (WITH_GHOST_WAYLAND_DYNLOAD). As the centos7 version of wayland is 1.15 so make this part of Blender's dependencies on Linux. We intend to enable Wayland for Blender 3.4 release, this is needed for the build-bot. Reviewed By: brecht Ref D16074
2022-09-27 11:54:35 +10:00
# SPDX-License-Identifier: GPL-2.0-or-later
ExternalProject_Add(external_wayland
URL file://${PACKAGE_DIR}/${WAYLAND_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH ${WAYLAND_HASH_TYPE}=${WAYLAND_HASH}
PREFIX ${BUILD_DIR}/wayland
Cleanup: wrap lines for in CMake's build-environment for readability - Commands which have arguments split over multiple lines use indented lines. - Wrap lines where multiple commands run using "&&". - Blank lines between multiple commands helps the text from becoming too dense.
2024-02-10 22:35:36 +11:00
Deps: Library changes for Blender 5.0 This commit includes the changes to the build system, updated hashes to the actual new libraries as well as a required test update. * DPC++ 6.2.0 RC * freetype 2.13.3 * HIP 6.4.5010 * IGC 2.16.0 * ISPC 1.28.0 * libharu 2.4.5 * libpng 1.6.50 * libvpx 1.15.2 * libxml2 2.14.5 * LLVM 20.1.8 * Manifold 3.2.1 * MaterialX 1.39.3 * OpenColorIO 2.4.2 * openexr 3.3.5 * OpenImageIO 3.0.9.1 * openjpeg 2.5.3 * OpenShadingLanguage 1.14.7.0 * openssl 3.5.2 * Python 3.11.13 * Rubber Band 4.0.0 * ShaderC 2025.3 * sqlite 3.50.4 * USD 25.08 * Wayland 1.24.0 Ref #138940 Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Jesse Yurkovich <jesse.y@gmail.com> Co-authored-by: Brecht Van Lommel <brecht@blender.org> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Sybren A. Stüvel <sybren@blender.org> Co-authored-by: Kace <lakacey03@gmail.com> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Pull Request: https://projects.blender.org/blender/blender/pulls/144479
2025-10-02 18:34:11 +02:00
# Use `-E` so the `PKG_CONFIG_PATH` can be defined to link against our own LIBEXPAT/LIBXML2/FFI.
Build: update various libraries for 3.4, fixing bugs and security issues THis is bumping dependencies to fix known CVEs, with the exception of OpenImageIO which also includes bugfixes for performance and correctness with some image types. zlib 1.2.12 -> 1.2.13 freetype 2.11.1 -> 2.12.1 openimageio 2.3.13.0 -> 2.3.20.0 python 3.10.2 -> 3.10.8 openjpeg 2.4.0 -> 2.5.0 ffmpeg 5.0 -> 5.1.2 sndfile 1.0.28 -> 1.1.0 xml2 2.9.10 -> 2.10.3 expat 2.4.4 -> 2.4.9 openssl 1.1.1g/i -> 1.1.1q sqlite 3.31.1 -> 3.37.2 Notable changes: * AOM: the hack we had in place to make it not detect pthreads on windows no longer worked with a more recent cmake version. Disabled pthreads with a diff on Windows. * Python: embedded copy of zlib 2.1.12 swapped out for our 2.1.13 copy with some folder manipulation on Windows. * Freetype: was harbouring a copy of zlib 2.1.12 as well, so that had to end. * FFmpeg: patch used to fix D11796 is no longer needed. Add new patch to deal with simple_idct.asm generating an object file with no sections in it, backport from upstream commit. * TinyXML: still being downloaded but no longer used by OpenColorIO, removed. * GMP applied upstream patch to fix CVE-2021-43618, as there is no release yet. * SQLite and Libsndfile patches no longer needed. Includes contributes by Ray Molenkamp, Campbell Barton and Brecht Van Lommel. Ref T101403 Differential Revision: https://developer.blender.org/D16269
2022-10-20 13:25:54 +02:00
#
Cleanup: wrap lines for in CMake's build-environment for readability - Commands which have arguments split over multiple lines use indented lines. - Wrap lines where multiple commands run using "&&". - Blank lines between multiple commands helps the text from becoming too dense.
2024-02-10 22:35:36 +11:00
CONFIGURE_COMMAND
${CMAKE_COMMAND} -E env
PKG_CONFIG_PATH=${LIBDIR}/expat/lib/pkgconfig:${LIBDIR}/xml2/lib/pkgconfig:${LIBDIR}/ffi/lib/pkgconfig:$PKG_CONFIG_PATH
${MESON}
--prefix ${LIBDIR}/wayland
${MESON_BUILD_TYPE}
-Ddocumentation=false
-Dtests=false
.
../external_wayland
Build: add wayland to deps build This is needed to ensure and up to date "wayland-scanner" is used, as versions before 1.20.0 generate headers incompatible with dynamic linking (WITH_GHOST_WAYLAND_DYNLOAD). As the centos7 version of wayland is 1.15 so make this part of Blender's dependencies on Linux. We intend to enable Wayland for Blender 3.4 release, this is needed for the build-bot. Reviewed By: brecht Ref D16074
2022-09-27 11:54:35 +10:00
BUILD_COMMAND ninja
INSTALL_COMMAND ninja install
)
add_dependencies(
external_wayland
external_expat
Build: fix missing xml2 build time dependency for wayland Also prepend the existing 'PKG_CONFIG_PATH' instead of overwriting it as this prevents 'devtoolset-9' libraries being used in the release environment.
2022-10-05 08:41:29 +11:00
external_xml2
Deps: harvest Wayland headers, build Wayland libraries The headers on centOS7 (Wayland 1.15) aren't compatible with the headers generated by wayland-scanner 1.20. Include the headers to support building Wayland on systems with older Wayland installed. Using these headers will be part of a separate commit. Part of D16091.
2022-10-08 07:46:59 +11:00
external_ffi
Build: ensure meson is built before use Meson is built as part of external_python_site_packages, without this dependency it would be called before being built. Also remove Meson as a build requirement since the version is used.
2022-12-13 11:12:39 +11:00
# Needed for `MESON`.
external_python_site_packages
Build: add wayland to deps build This is needed to ensure and up to date "wayland-scanner" is used, as versions before 1.20.0 generate headers incompatible with dynamic linking (WITH_GHOST_WAYLAND_DYNLOAD). As the centos7 version of wayland is 1.15 so make this part of Blender's dependencies on Linux. We intend to enable Wayland for Blender 3.4 release, this is needed for the build-bot. Reviewed By: brecht Ref D16074
2022-09-27 11:54:35 +10:00
)
Refactor: Move Linux/macOS harvest to individual files More closely matching Windows and easier to update. Pull Request: https://projects.blender.org/blender/blender/pulls/123196
2024-07-02 16:49:22 +02:00
harvest(external_wayland wayland/bin wayland/bin "wayland-scanner")
harvest(external_wayland wayland/include wayland/include "*.h")
# Only needed for running the WESTON compositor.
harvest(external_wayland wayland/lib64 wayland/lib64 "*")
Reference in New Issue Copy Permalink