1- diff -ruN ffmpeg-8.0 /configure ffmpeg-8.0 -patch/configure
2- --- ffmpeg-8.0 /configure 2025-08-22 18:24:23 .000000000 +0900
3- +++ ffmpeg-8.0 -patch/configure 2025-08-25 00:18:04.652203941 +0900
4- @@ -7017 ,7 +7017 ,7 @@
1+ diff -ruN ffmpeg-8.1 /configure ffmpeg-8.1 -patch/configure
2+ --- ffmpeg-8.1 /configure 2026-03-17 03:13:04 .000000000 +0900
3+ +++ ffmpeg-8.1 -patch/configure 2026-04-07 17:14:29.170628183 +0900
4+ @@ -7232 ,7 +7232 ,7 @@
55 enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; }
66 enabled ladspa && require_headers "ladspa.h dlfcn.h"
77 enabled lcms2 && require_pkg_config lcms2 "lcms2 >= 2.13" lcms2.h cmsCreateContext
@@ -10,16 +10,16 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
1010 enabled liboapv && require_pkg_config liboapv "oapv >= 0.2.0.0" "oapv/oapv.h" oapve_encode
1111 enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new ||
1212 { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } ||
13- @@ -7046 ,7 +7046 ,7 @@
13+ @@ -7261 ,7 +7261 ,7 @@
1414 enabled libflite && require libflite "flite/flite.h" flite_init $flite_extralibs
1515 enabled fontconfig && enable libfontconfig
1616 enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
1717- enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
1818+ enabled libfreetype && add_cppflags -I ../include/freetype2/ && require libfreetype "ft2build.h FT_FREETYPE_H" FT_Init_FreeType -lfreetype
1919 enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
2020 enabled libharfbuzz && require_pkg_config libharfbuzz harfbuzz hb.h hb_buffer_create
21- enabled libglslang && { check_lib spirv_compiler glslang/Include/glslang_c_interface.h glslang_initialize_process \
22- @@ -7078 ,15 +7078 ,7 @@
21+ if enabled libglslang; then
22+ @@ -7297 ,15 +7297 ,7 @@
2323 # pkg-config support. Instead, users should make sure that the build
2424 # can find the libraries and headers through other means.
2525 elif enabled libmfx; then
@@ -28,18 +28,18 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
2828- # includedir=/usr/include
2929- # Cflags: -I${includedir}
3030- # So add -I${includedir}/mfx to CFLAGS
31- - { check_pkg_config libmfx "libmfx >= 1.28 libmfx < 2.0" "mfx/mfxvideo.h" MFXInit && add_cflags -I${libmfx_incdir}/mfx; } ||
31+ - { check_pkg_config libmfx "libmfx >= 1.28 libmfx < 2.0" "mfx/mfxvideo.h" MFXInit && add_cppflags -I${libmfx_incdir}/mfx; } ||
3232- { require libmfx "mfxvideo.h mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" &&
3333- { test_cpp_condition mfxdefs.h "MFX_VERSION >= 1028 && MFX_VERSION < 2000" || die "ERROR: libmfx version must be >= 1.28 and < 2.0"; } &&
3434- warn "using libmfx without pkg-config"; } } &&
3535+ require libmfx "mfx/mfxvideo.h" MFXInit -lmfx && warn "using libmfx without pkg-config" &&
3636 warn "libmfx is deprecated. Please run configure with --enable-libvpl to use libvpl instead."
3737 elif enabled libvpl; then
3838 # Consider pkg-config only. The name of libmfx is still passed to check_pkg_config function for --enable-libvpl option
39- @@ -7115 ,21 +7107 ,14 @@
40- { check_pkg_config libopencv opencv opencv2/core/core_c.h cvCreateImageHeader ||
41- require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
42- require_pkg_config libopencv opencv opencv/cxcore .h cvCreateImageHeader; }
39+ @@ -7340 ,21 +7332 ,14 @@
40+ enabled libopencv && { check_pkg_config libopencv opencv4 opencv2/core/core_c.h cvCreateImageHeader ||
41+ require libopencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; }
42+ enabled libopencolorio && require_pkg_config_cxx libopencolorio "OpenColorIO" OpenColorIO/OpenColorIO .h OCIO_NAMESPACE::Config
4343- enabled libopenh264 && require_pkg_config libopenh264 "openh264 >= 1.3.0" wels/codec_api.h WelsGetCodecVersion
4444+ enabled libopenh264 && require libopenh264 wels/codec_api.h WelsGetCodecVersion -lopenh264 $pthreads_extralibs
4545 enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
@@ -60,7 +60,7 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
6060 enabled libplacebo && require_pkg_config libplacebo "libplacebo >= 5.229.0" libplacebo/vulkan.h pl_vulkan_create
6161 enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new
6262 enabled libqrencode && require_pkg_config libqrencode libqrencode qrencode.h QRcode_encodeString
63- @@ -7147 ,9 +7132 ,9 @@
63+ @@ -7372 ,9 +7357 ,9 @@
6464 enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
6565 enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
6666 enabled libssh && require_pkg_config libssh "libssh >= 0.6.0" libssh/sftp.h sftp_init
@@ -70,10 +70,10 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
7070+ enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
7171+ enabled libsrt && require libsrt srt/srt.h srt_startup -lsrt -lcrypto -lssl
7272+ enabled libsvtav1 && require libsvtav1 EbSvtAv1Enc.h svt_av1_enc_init_handle -lSvtAv1Enc $pthreads_extralibs
73+ enabled libsvtjpegxs && require_pkg_config libsvtjpegxs "SvtJpegxs >= 0.10.0" SvtJpegxsEnc.h svt_jpeg_xs_encoder_init
7374 enabled libtensorflow && require libtensorflow tensorflow/c/c_api.h TF_Version -ltensorflow
7475 enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate
75- enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
76- @@ -7171,19 +7156,15 @@
76+ @@ -7399,19 +7384,15 @@
7777
7878 enabled libvpx && {
7979 enabled libvpx_vp8_decoder && {
@@ -93,7 +93,7 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
9393 check_lib libvpx_vp9_encoder "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_vp9_cx VPX_IMG_FMT_HIGHBITDEPTH" "-lvpx $libm_extralibs $pthreads_extralibs"
9494 }
9595 if disabled_all libvpx_vp8_decoder libvpx_vp9_decoder libvpx_vp8_encoder libvpx_vp9_encoder; then
96- @@ -7193,27 +7174,27 @@
96+ @@ -7421,15 +7402,15 @@
9797
9898 enabled libvvenc && require_pkg_config libvvenc "libvvenc >= 1.6.1" "vvenc/vvenc.h" vvenc_get_version
9999 enabled libwebp && {
@@ -113,8 +113,9 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
113113 require_cpp_condition libx265 x265.h "X265_BUILD >= 89"
114114 enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs"
115115 enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get
116- enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode
116+ @@ -7438,12 +7419,12 @@
117117 enabled libxeve && require_pkg_config libxeve "xeve >= 0.5.1" "xeve.h" xeve_encode
118+ enabled libxeveb && require_pkg_config libxeveb "xeveb >= 0.5.1" "xeve.h" xeve_encode
118119 enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore
119120- enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version
120121+ enabled libzimg && require libzimg zimg.h zimg_get_api_version -lzimg
@@ -127,57 +128,52 @@ diff -ruN ffmpeg-8.0/configure ffmpeg-8.0-patch/configure
127128 enabled mbedtls && { check_pkg_config mbedtls mbedtls mbedtls/x509_crt.h mbedtls_x509_crt_init ||
128129 check_pkg_config mbedtls mbedtls mbedtls/ssl.h mbedtls_ssl_init ||
129130 check_lib mbedtls mbedtls/ssl.h mbedtls_ssl_init -lmbedtls -lmbedx509 -lmbedcrypto ||
130- @@ -7258,11 +7239,12 @@
131+ @@ -7489,13 +7470,14 @@
131132 enabled omx && require_headers OMX_Core.h && \
132133 warn "The OpenMAX encoders are deprecated and will be removed in future versions"
133134
134- - enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h OPENSSL_init_ssl &&
135+ - enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0" openssl/ssl.h DTLS_get_data_mtu &&
135136- { enabled gplv3 || ! enabled gpl || enabled nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
136137- { enabled gpl && ! enabled nonfree && die "ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
137- - check_pkg_config openssl "openssl >= 1.1.0" openssl/ssl.h OPENSSL_init_ssl ||
138+ - check_pkg_config openssl "openssl >= 1.1.1" openssl/ssl.h DTLS_get_data_mtu ||
139+ - check_lib openssl openssl/ssl.h DTLS_get_data_mtu -lssl -lcrypto ||
140+ - check_lib openssl openssl/ssl.h DTLS_get_data_mtu -lssl -lcrypto -lws2_32 -lgdi32 ||
141+ - die "ERROR: openssl (>= 1.1.1) not found"; }
138142+ enabled openssl && {
139143+ check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
140144+ check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
141- check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
145+ + check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
142146+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto $pthreads_extralibs ||
143147+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl32 -leay32 ||
144- check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
145- die "ERROR: openssl (>= 1.1.0) not found"; }
148+ + check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
149+ + die "ERROR: openssl (>= 1.1.0) not found"; }
146150 enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
147- @@ -7273,15 +7255,6 @@
148- }
149- enabled vapoursynth && require_headers "vapoursynth/VSScript4.h vapoursynth/VapourSynth4.h"
150-
151- - enabled openssl && {
152- - enabled whip_muxer && {
153- - $pkg_config --exists --print-errors "openssl >= 1.0.1k" ||
154- - require_pkg_config openssl "openssl >= 1.0.1k" openssl/ssl.h SSL_library_init ||
155- - require_pkg_config openssl "openssl >= 1.0.1k" openssl/ssl.h OPENSSL_init_ssl
156- - }
157- - }
158- -
159- -
160- if enabled gcrypt; then
161- GCRYPT_CONFIG="${cross_prefix}libgcrypt-config"
162- if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then
163- @@ -7513,19 +7486,13 @@
164- enabled vdpau &&
151+ enabled rkmpp && { require_pkg_config rkmpp "rockchip_mpp >= 1.3.8" "rockchip/rk_mpi.h rockchip/mpp_buffer.h" "mpp_create mpp_buffer_sync_begin_f" &&
152+ { enabled libdrm ||
153+ @@ -7735,10 +7717,7 @@
165154 check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11
166155
156+ # Check for the Vulkan headers
167157- if enabled_all vulkan vulkan_static; then
168158- check_pkg_config vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" ||
169159- check_lib vulkan "vulkan/vulkan.h" vkGetInstanceProcAddr -lvulkan
170160- elif enabled vulkan; then
171161+ if enabled vulkan; then
172162 check_pkg_config_header_only vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" ||
173- check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)"
163+ check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" $vulkan_incflags
174164 fi
165+ @@ -7782,13 +7761,7 @@
166+ fi
167+ }
175168
176- if disabled vulkan; then
177- disable libglslang libshaderc spirv_compiler
178- - else
169+ - if enabled vulkan; then
179170- check_pkg_config_header_only vulkan_1_4 "vulkan >= 1.4.317" "vulkan/vulkan.h" "defined VK_VERSION_1_4" ||
180- - check_cpp_condition vulkan_1_4 "vulkan/vulkan.h" "defined(VK_VERSION_1_5) || (defined(VK_VERSION_1_4) && VK_HEADER_VERSION >= 317)"
171+ - check_cpp_condition vulkan_1_4 "vulkan/vulkan.h" "defined(VK_VERSION_1_5) || (defined(VK_VERSION_1_4) && VK_HEADER_VERSION >= 317)" $vulkan_incflags
172+ - for program in $glslc glslc glslang glslangValidator; do
173+ - probe_glslc $program && break
174+ - done
175+ - else
176+ + if disabled vulkan; then
177+ disable libglslang libshaderc spirv_library spirv_compiler
181178 fi
182179
183- if enabled x86; then
0 commit comments