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
42 lines
1.5 KiB
CMake
42 lines
1.5 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
if(WIN32)
|
|
# The default generator on windows is msbuild, which we do not
|
|
# want to use for this dep, as needs to build with mingw
|
|
set(AOM_GENERATOR "Ninja")
|
|
# The default flags are full of MSVC options given this will be
|
|
# building with mingw, it'll have an unhappy time with that and
|
|
# we need to clear them out.
|
|
set(AOM_CMAKE_FLAGS )
|
|
else()
|
|
set(AOM_GENERATOR "Unix Makefiles")
|
|
set(AOM_CMAKE_FLAGS ${DEFAULT_CMAKE_FLAGS})
|
|
endif()
|
|
|
|
set(AOM_EXTRA_ARGS
|
|
-DENABLE_TESTDATA=OFF
|
|
-DENABLE_TESTS=OFF
|
|
-DENABLE_TOOLS=OFF
|
|
-DENABLE_EXAMPLES=OFF
|
|
${AOM_EXTRA_ARGS_WIN32}
|
|
)
|
|
|
|
# This is slightly different from all other deps in the way that
|
|
# aom uses cmake as a build system, but still needs the environment setup
|
|
# to include perl so we manually setup the environment and call
|
|
# cmake directly for the configure, build and install commands.
|
|
|
|
ExternalProject_Add(external_aom
|
|
URL file://${PACKAGE_DIR}/${AOM_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${AOM_HASH_TYPE}=${AOM_HASH}
|
|
PREFIX ${BUILD_DIR}/aom
|
|
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/aom/src/external_aom < ${PATCH_DIR}/aom.diff
|
|
CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
|
|
cd ${BUILD_DIR}/aom/src/external_aom-build/ &&
|
|
${CMAKE_COMMAND} -G "${AOM_GENERATOR}" -DCMAKE_INSTALL_PREFIX=${LIBDIR}/aom ${AOM_CMAKE_FLAGS} ${AOM_EXTRA_ARGS} ${BUILD_DIR}/aom/src/external_aom/
|
|
BUILD_COMMAND ${CMAKE_COMMAND} --build .
|
|
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
|
|
INSTALL_DIR ${LIBDIR}/aom
|
|
)
|