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
36 lines
1.3 KiB
CMake
36 lines
1.3 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(SSL_CONFIGURE_COMMAND ./Configure)
|
|
set(SSL_PATCH_CMD echo .)
|
|
|
|
if(APPLE)
|
|
set(SSL_OS_COMPILER "blender-darwin-${CMAKE_OSX_ARCHITECTURES}")
|
|
set(SSL_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/ssl/src/external_ssl < ${PATCH_DIR}/ssl.diff)
|
|
else()
|
|
if(BLENDER_PLATFORM_ARM)
|
|
set(SSL_OS_COMPILER "blender-linux-aarch64")
|
|
elseif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
|
|
set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
|
|
set(SSL_OS_COMPILER "blender-linux-x86_64")
|
|
else()
|
|
set(SSL_OS_COMPILER "blender-linux-x86")
|
|
endif()
|
|
endif()
|
|
|
|
ExternalProject_Add(external_ssl
|
|
URL file://${PACKAGE_DIR}/${SSL_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH}
|
|
PREFIX ${BUILD_DIR}/ssl
|
|
PATCH_COMMAND ${SSL_PATCH_CMD}
|
|
CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
|
|
--openssldir=${LIBDIR}/ssl
|
|
no-shared
|
|
no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
|
|
--config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
|
|
${SSL_OS_COMPILER}
|
|
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
|
|
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
|
|
INSTALL_DIR ${LIBDIR}/ssl
|
|
)
|