Ray molenkamp
21deba56aa
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
86 lines
2.4 KiB
CMake
86 lines
2.4 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
if(BLENDER_PLATFORM_ARM)
|
|
set(LLVM_TARGETS AArch64$<SEMICOLON>ARM)
|
|
else()
|
|
set(LLVM_TARGETS X86)
|
|
endif()
|
|
|
|
if(APPLE)
|
|
set(LLVM_XML2_ARGS
|
|
-DLIBXML2_LIBRARY=${LIBDIR}/xml2/lib/libxml2.a
|
|
-DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
|
|
)
|
|
set(LLVM_BUILD_CLANG_TOOLS_EXTRA ^^clang-tools-extra)
|
|
set(BUILD_CLANG_TOOLS ON)
|
|
endif()
|
|
|
|
|
|
set(LLVM_EXTRA_ARGS
|
|
-DLLVM_USE_CRT_RELEASE=MD
|
|
-DLLVM_USE_CRT_DEBUG=MDd
|
|
-DLLVM_INCLUDE_TESTS=OFF
|
|
-DLLVM_TARGETS_TO_BUILD=${LLVM_TARGETS}
|
|
-DLLVM_INCLUDE_EXAMPLES=OFF
|
|
-DLLVM_ENABLE_TERMINFO=OFF
|
|
-DLLVM_BUILD_LLVM_C_DYLIB=OFF
|
|
-DLLVM_ENABLE_UNWIND_TABLES=OFF
|
|
-DLLVM_ENABLE_PROJECTS=clang${LLVM_BUILD_CLANG_TOOLS_EXTRA}
|
|
-DPython3_ROOT_DIR=${LIBDIR}/python/
|
|
-DPython3_EXECUTABLE=${PYTHON_BINARY}
|
|
${LLVM_XML2_ARGS}
|
|
)
|
|
|
|
if(WIN32)
|
|
set(LLVM_GENERATOR "Ninja")
|
|
list(APPEND LLVM_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
|
|
else()
|
|
set(LLVM_GENERATOR "Unix Makefiles")
|
|
endif()
|
|
|
|
# short project name due to long filename issues on windows
|
|
ExternalProject_Add(ll
|
|
URL file://${PACKAGE_DIR}/${LLVM_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${LLVM_HASH_TYPE}=${LLVM_HASH}
|
|
CMAKE_GENERATOR ${LLVM_GENERATOR}
|
|
LIST_SEPARATOR ^^
|
|
PREFIX ${BUILD_DIR}/ll
|
|
SOURCE_SUBDIR llvm
|
|
PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
|
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
|
|
INSTALL_DIR ${LIBDIR}/llvm
|
|
)
|
|
|
|
if(MSVC)
|
|
if(BUILD_MODE STREQUAL Release)
|
|
set(LLVM_HARVEST_COMMAND
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib ${HARVEST_TARGET}/llvm/lib &&
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include ${HARVEST_TARGET}/llvm/include &&
|
|
${CMAKE_COMMAND} -E copy ${LIBDIR}/llvm/bin/clang-format.exe ${HARVEST_TARGET}/llvm/bin/clang-format.exe
|
|
)
|
|
else()
|
|
set(LLVM_HARVEST_COMMAND
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
|
|
${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
|
|
)
|
|
endif()
|
|
ExternalProject_Add_Step(ll after_install
|
|
COMMAND ${LLVM_HARVEST_COMMAND}
|
|
DEPENDEES mkdir update patch download configure build install
|
|
)
|
|
endif()
|
|
|
|
# We currently do not build libxml2 on Windows.
|
|
if(APPLE)
|
|
add_dependencies(
|
|
ll
|
|
external_xml2
|
|
)
|
|
endif()
|
|
|
|
add_dependencies(
|
|
ll
|
|
external_python
|
|
)
|