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
145 lines
4.8 KiB
CMake
145 lines
4.8 KiB
CMake
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include -I${mingw_LIBDIR}/aom/include")
|
|
set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib -L${mingw_LIBDIR}/aom/lib")
|
|
set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
|
|
set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:${mingw_LIBDIR}/aom/lib/pkgconfig:)
|
|
|
|
if(WIN32)
|
|
set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
|
|
set(FFMPEG_EXTRA_FLAGS
|
|
${FFMPEG_EXTRA_FLAGS}
|
|
--disable-static
|
|
--enable-shared
|
|
--enable-w32threads
|
|
--disable-pthreads
|
|
--enable-libopenjpeg
|
|
--disable-mediafoundation
|
|
)
|
|
else()
|
|
set(FFMPEG_EXTRA_FLAGS
|
|
${FFMPEG_EXTRA_FLAGS}
|
|
--enable-static
|
|
--disable-shared
|
|
--enable-libopenjpeg
|
|
)
|
|
endif()
|
|
|
|
if(APPLE)
|
|
set(FFMPEG_EXTRA_FLAGS
|
|
${FFMPEG_EXTRA_FLAGS}
|
|
--target-os=darwin
|
|
--x86asmexe=${LIBDIR}/nasm/bin/nasm
|
|
)
|
|
elseif(UNIX)
|
|
set(FFMPEG_EXTRA_FLAGS
|
|
${FFMPEG_EXTRA_FLAGS}
|
|
--x86asmexe=${LIBDIR}/nasm/bin/nasm
|
|
)
|
|
endif()
|
|
|
|
ExternalProject_Add(external_ffmpeg
|
|
URL file://${PACKAGE_DIR}/${FFMPEG_FILE}
|
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
|
URL_HASH ${FFMPEG_HASH_TYPE}=${FFMPEG_HASH}
|
|
# OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
|
|
# want for maximum runtime performance, but due to static nature of that library we
|
|
# need to force ffmpeg to link against pthread, otherwise test program used by autoconf
|
|
# will fail. This patch does that in a way that is compatible with multiple distributions.
|
|
PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
|
|
PREFIX ${BUILD_DIR}/ffmpeg
|
|
CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
|
|
cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
|
|
${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
|
|
--disable-lzma
|
|
--disable-avfilter
|
|
--disable-vdpau
|
|
--disable-bzlib
|
|
--disable-libgsm
|
|
--disable-libspeex
|
|
--enable-libvpx
|
|
--enable-libopus
|
|
--prefix=${LIBDIR}/ffmpeg
|
|
--enable-libtheora
|
|
--enable-libvorbis
|
|
--enable-zlib
|
|
--enable-stripping
|
|
--enable-runtime-cpudetect
|
|
--disable-vaapi
|
|
--disable-nonfree
|
|
--enable-gpl
|
|
--disable-postproc
|
|
--enable-libmp3lame
|
|
--disable-librtmp
|
|
--enable-libx264
|
|
--enable-libxvid
|
|
--enable-libaom
|
|
--disable-libopencore-amrnb
|
|
--disable-libopencore-amrwb
|
|
--disable-libdc1394
|
|
--disable-version3
|
|
--disable-debug
|
|
--enable-optimizations
|
|
--enable-ffplay
|
|
--disable-openssl
|
|
--disable-securetransport
|
|
--disable-indev=avfoundation
|
|
--disable-indev=qtkit
|
|
--disable-sdl2
|
|
--disable-gnutls
|
|
--disable-videotoolbox
|
|
--disable-libxcb
|
|
--disable-xlib
|
|
--disable-audiotoolbox
|
|
--disable-cuvid
|
|
--disable-nvenc
|
|
--disable-indev=jack
|
|
--disable-indev=alsa
|
|
--disable-outdev=alsa
|
|
--disable-crystalhd
|
|
--disable-sndio
|
|
BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
|
|
INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
|
|
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
|
|
INSTALL_DIR ${LIBDIR}/ffmpeg
|
|
)
|
|
|
|
if(MSVC)
|
|
set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
|
|
endif()
|
|
|
|
add_dependencies(
|
|
external_ffmpeg
|
|
external_zlib
|
|
external_openjpeg
|
|
external_xvidcore
|
|
external_x264
|
|
external_opus
|
|
external_vpx
|
|
external_theora
|
|
external_vorbis
|
|
external_ogg
|
|
external_lame
|
|
external_aom
|
|
)
|
|
if(WIN32)
|
|
add_dependencies(
|
|
external_ffmpeg
|
|
external_zlib_mingw
|
|
)
|
|
endif()
|
|
if(UNIX)
|
|
add_dependencies(
|
|
external_ffmpeg
|
|
external_nasm
|
|
)
|
|
endif()
|
|
|
|
if(BUILD_MODE STREQUAL Release AND WIN32)
|
|
ExternalProject_Add_Step(external_ffmpeg after_install
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
|
|
DEPENDEES install
|
|
)
|
|
endif()
|