The branch, release/8.0 has been updated
via 27a297f1866d13c51a18648469f347177124d3ac (commit)
via a32b797f6437c696813f958cf54cfa5ecc827da3 (commit)
via 29c046c37aa6eb97d1ea95126bb59502558f497e (commit)
from fe72a8781b22912ec7125de1509d83fc2b1ad802 (commit)
- Log -----------------------------------------------------------------
commit 27a297f1866d13c51a18648469f347177124d3ac
Author: Jack Lau <[email protected]>
AuthorDate: Mon Nov 17 13:32:05 2025 +0800
Commit: Brad Smith <[email protected]>
CommitDate: Sat Nov 29 05:06:34 2025 -0500
configure: replace openssl header check with 1.1.1 API
Fix #20571
Avoid build errors with openssl forks (like libressl)
that lack some APIs.
This patch replace header check for OPENSSL_init_ssl
(was added in 1.1.0) with the OpenSSL 1.1.1 new API
DTLS_get_data_mtu.
Signed-off-by: Jack Lau <[email protected]>
(cherry picked from commit 0486ad61ceb71b7a45976e6e45a4d2a2813aef75)
diff --git a/configure b/configure
index af29901deb..46ee3cb2bf 100755
--- a/configure
+++ b/configure
@@ -7262,12 +7262,12 @@ enabled omx_rpi && { test_code cc OMX_Core.h
OMX_IndexConfigBrcmVideoR
enabled omx && require_headers OMX_Core.h && \
warn "The OpenMAX encoders are deprecated and will be removed in future
versions"
-enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0"
openssl/ssl.h OPENSSL_init_ssl &&
+enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0"
openssl/ssl.h DTLS_get_data_mtu &&
{ enabled gplv3 || ! enabled gpl || enabled
nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
{ enabled gpl && ! enabled nonfree && die
"ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
- check_pkg_config openssl "openssl >= 1.1.1"
openssl/ssl.h OPENSSL_init_ssl ||
- check_lib openssl openssl/ssl.h
OPENSSL_init_ssl -lssl -lcrypto ||
- check_lib openssl openssl/ssl.h
OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
+ check_pkg_config openssl "openssl >= 1.1.1"
openssl/ssl.h DTLS_get_data_mtu ||
+ check_lib openssl openssl/ssl.h
DTLS_get_data_mtu -lssl -lcrypto ||
+ check_lib openssl openssl/ssl.h
DTLS_get_data_mtu -lssl -lcrypto -lws2_32 -lgdi32 ||
die "ERROR: openssl (>= 1.1.1) not found"; }
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx
pocketsphinx/pocketsphinx.h ps_init
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp
rockchip/rk_mpi.h mpp_create &&
commit a32b797f6437c696813f958cf54cfa5ecc827da3
Author: Kacper MichajÅow <[email protected]>
AuthorDate: Wed Jul 30 20:08:38 2025 +0200
Commit: Brad Smith <[email protected]>
CommitDate: Sat Nov 29 05:06:09 2025 -0500
configure: require at least OpenSSL 1.1.1 (LTS)
Commit f256487cd8f29f24036efa5d91a84a26b048861a bumped requirement to
1.1.0 for OPENSSL_init_ssl.
Bump this again to 1.1.1, because it was an LTS version. Although it has
no mainline support anymore, it still has paid/premium support. 1.1.0 has
no support at all.
Motivated for use of BIO_read_ex() for next commits.
Signed-off-by: Kacper MichajÅow <[email protected]>
(cherry picked from commit 113c9c6cf36a703afc5ef10bbb40f248df521425)
diff --git a/Changelog b/Changelog
index e943157f1d..40150f8517 100644
--- a/Changelog
+++ b/Changelog
@@ -83,6 +83,7 @@ version 8.0:
- Whisper filter
- Drop support for OpenSSL < 1.1.0
- Enable TLS peer certificate verification by default (on next major version
bump)
+- Drop support for OpenSSL < 1.1.1
- yasm support dropped, users need to use nasm
- VVC VAAPI decoder
- RealVideo 6.0 decoder
diff --git a/configure b/configure
index 9256ceec20..af29901deb 100755
--- a/configure
+++ b/configure
@@ -7265,10 +7265,10 @@ enabled omx && require_headers OMX_Core.h
&& \
enabled openssl && { { check_pkg_config openssl "openssl >= 3.0.0"
openssl/ssl.h OPENSSL_init_ssl &&
{ enabled gplv3 || ! enabled gpl || enabled
nonfree || die "ERROR: OpenSSL >=3.0.0 requires --enable-version3"; }; } ||
{ enabled gpl && ! enabled nonfree && die
"ERROR: OpenSSL <3.0.0 is incompatible with the gpl"; } ||
- check_pkg_config openssl "openssl >= 1.1.0"
openssl/ssl.h OPENSSL_init_ssl ||
+ check_pkg_config openssl "openssl >= 1.1.1"
openssl/ssl.h OPENSSL_init_ssl ||
check_lib openssl openssl/ssl.h
OPENSSL_init_ssl -lssl -lcrypto ||
check_lib openssl openssl/ssl.h
OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
- die "ERROR: openssl (>= 1.1.0) not found"; }
+ die "ERROR: openssl (>= 1.1.1) not found"; }
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx
pocketsphinx/pocketsphinx.h ps_init
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp
rockchip/rk_mpi.h mpp_create &&
require_pkg_config rockchip_mpp "rockchip_mpp
>= 1.3.7" rockchip/rk_mpi.h mpp_create &&
commit 29c046c37aa6eb97d1ea95126bb59502558f497e
Author: Jack Lau <[email protected]>
AuthorDate: Sat Sep 6 10:18:39 2025 +0800
Commit: Brad Smith <[email protected]>
CommitDate: Sat Nov 29 05:05:31 2025 -0500
configure: remove openssl version check for whip
This version check for whip is unnecessary.
Since several rencet patches to the configure
have already added version checks for OpenSSL.
Signed-off-by: Jack Lau <[email protected]>
(cherry picked from commit adc66f30ee3cbd55d42e6079d381fa1a485adb52)
diff --git a/configure b/configure
index a0eed36abf..9256ceec20 100755
--- a/configure
+++ b/configure
@@ -7277,15 +7277,6 @@ enabled rkmpp && { require_pkg_config rkmpp
rockchip_mpp rockchip/r
}
enabled vapoursynth && require_headers "vapoursynth/VSScript4.h
vapoursynth/VapourSynth4.h"
-enabled openssl && {
- enabled whip_muxer && {
- $pkg_config --exists --print-errors "openssl >= 1.0.1k" ||
- require_pkg_config openssl "openssl >= 1.0.1k" openssl/ssl.h
SSL_library_init ||
- require_pkg_config openssl "openssl >= 1.0.1k" openssl/ssl.h
OPENSSL_init_ssl
- }
-}
-
-
if enabled gcrypt; then
GCRYPT_CONFIG="${cross_prefix}libgcrypt-config"
if "${GCRYPT_CONFIG}" --version > /dev/null 2>&1; then
-----------------------------------------------------------------------
Summary of changes:
Changelog | 1 +
configure | 19 +++++--------------
2 files changed, 6 insertions(+), 14 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
