The branch, master has been updated
via 0486ad61ceb71b7a45976e6e45a4d2a2813aef75 (commit)
from f790de2a878861a34820d7d8ab64badd192331f5 (commit)
- Log -----------------------------------------------------------------
commit 0486ad61ceb71b7a45976e6e45a4d2a2813aef75
Author: Jack Lau <[email protected]>
AuthorDate: Mon Nov 17 13:32:05 2025 +0800
Commit: James Almer <[email protected]>
CommitDate: Mon Nov 24 21:29:45 2025 +0000
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]>
diff --git a/configure b/configure
index 7d6061b55c..99734e9d03 100755
--- a/configure
+++ b/configure
@@ -7353,12 +7353,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 &&
-----------------------------------------------------------------------
Summary of changes:
configure | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
