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
56 lines
2.1 KiB
CMake
56 lines
2.1 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(SQLITE_CONFIGURE_ENV echo .)
|
|
set(SQLITE_CONFIGURATION_ARGS)
|
|
|
|
if(UNIX)
|
|
if(NOT APPLE)
|
|
set(SQLITE_LDFLAGS -Wl,--as-needed)
|
|
endif()
|
|
set(SQLITE_CFLAGS
|
|
"-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
|
|
-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
|
|
-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
|
|
-DSQLITE_ENABLE_UNLOCK_NOTIFY \
|
|
-DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
|
|
-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
|
|
-DSQLITE_ENABLE_LOAD_EXTENSION \
|
|
-DSQLITE_ENABLE_JSON1 \
|
|
-DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
|
|
-DSQLITE_THREADSAFE=1 \
|
|
-DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
|
|
-DSQLITE_MAX_SCHEMA_RETRY=25 \
|
|
-DSQLITE_ENABLE_PREUPDATE_HOOK \
|
|
-DSQLITE_ENABLE_SESSION \
|
|
-DSQLITE_ENABLE_STMTVTAB \
|
|
-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
|
|
-fPIC")
|
|
set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
|
|
set(SQLITE_CONFIGURATION_ARGS
|
|
${SQLITE_CONFIGURATION_ARGS}
|
|
--enable-threadsafe
|
|
--enable-load-extension
|
|
--enable-json1
|
|
--enable-fts4
|
|
--enable-fts5
|
|
# While building `tcl` is harmless, it causes problems when the install step
|
|
# tries to copy the files into the system path.
|
|
# Since this isn't required by Python or Blender this can be disabled.
|
|
# Note that Debian (for example), splits this off into a separate package,
|
|
# so it's safe to turn off.
|
|
--disable-tcl
|
|
--enable-shared=no
|
|
)
|
|
endif()
|
|
|
|
ExternalProject_Add(external_sqlite
|
|
URL file://${PACKAGE_DIR}/${SQLITE_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${SQLITE_HASH_TYPE}=${SQLITE_HASH}
|
|
PREFIX ${BUILD_DIR}/sqlite
|
|
CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
|
|
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
|
|
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
|
|
INSTALL_DIR ${LIBDIR}/sqlite
|
|
)
|