Anthony Roberts
ee1b2f53cc
Currently on Windows some dependencies are built with MinGW/GCC 3.x this commit removes that, in favor of building them with MSVC via msys2. This will make it easier in the future to offer Win/Arm64 builds of blender. Notable changes: - This change drops support for the external libxvid library in favor of ffmpegs built in support for this format. This has been done with permission from the VFX module. Pull Request: https://projects.blender.org/blender/blender/pulls/108983 https://projects.blender.org/blender/blender/pulls/105502
53 lines
4.2 KiB
Diff
53 lines
4.2 KiB
Diff
diff -Naur ffmpeg-clean/configure ffmpeg-dirty/configure
|
|
--- ffmpeg-clean/configure 2023-02-27 20:43:45.000000000 +0000
|
|
+++ ffmpeg-dirty/configure 2023-05-25 09:49:24.949566500 +0100
|
|
@@ -6563,7 +6563,7 @@
|
|
enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
|
|
enabled ladspa && require_headers "ladspa.h dlfcn.h"
|
|
enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext
|
|
-enabled libaom && require_pkg_config libaom "aom >= 1.0.0" aom/aom_codec.h aom_codec_version
|
|
+enabled libaom && { require libaom aom/aom_codec.h aom_codec_version -laom; }
|
|
enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new ||
|
|
{ enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
|
|
die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; }
|
|
@@ -6654,16 +6654,15 @@
|
|
require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
|
|
require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
|
|
enabled libopenh264 && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
|
|
-enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
|
|
- { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
|
|
+enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version "-DOPJ_STATIC" -lopenjp2
|
|
enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
|
|
enabled libopenvino && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
|
|
enabled libopus && {
|
|
enabled libopus_decoder && {
|
|
- require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create
|
|
+ require libopus opus_multistream.h opus_multistream_decoder_create -lopus
|
|
}
|
|
enabled libopus_encoder && {
|
|
- require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create
|
|
+ require libopus opus_multistream.h opus_multistream_encoder_create -lopus
|
|
}
|
|
}
|
|
enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 4.192.0" libplacebo/vulkan.h pl_vulkan_create
|
|
@@ -6696,8 +6695,8 @@
|
|
enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit
|
|
enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 2.0.0" libvmaf.h vmaf_init
|
|
enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc
|
|
-enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init &&
|
|
- require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init
|
|
+enabled libvorbis && require libvorbis vorbis/codec.h vorbis_info_init -lvorbis -logg -lvorbisfile &&
|
|
+ require libvorbisenc vorbis/vorbisenc.h vorbis_encode_init -lvorbis -lvorbisenc -logg -lvorbisfile
|
|
|
|
enabled libvpx && {
|
|
enabled libvpx_vp8_decoder && {
|
|
@@ -6724,7 +6723,7 @@
|
|
enabled libwebp && {
|
|
enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
|
|
enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
|
|
-enabled libx264 && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
|
|
+enabled libx264 && require libx264 "stdint.h x264.h" x264_encoder_encode -lx264 &&
|
|
require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && {
|
|
[ "$toolchain" != "msvc" ] ||
|
|
require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&
|