On 25 Jun 2025, at 21:59, Marvin Scholz wrote:
> Given that OPENSSL_init_ssl was introduced in 1.1.0 means we can rely on
> that to ensure we have at least 1.1.0.
> ---
> configure | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index d625461983..25d736170b 100755
> --- a/configure
> +++ b/configure
> @@ -7193,13 +7193,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
> openssl/ssl.h OPENSSL_init_ssl ||
> - check_pkg_config openssl openssl
> openssl/ssl.h SSL_library_init ||
> + check_pkg_config openssl "openssl >= 1.1.0"
> openssl/ssl.h OPENSSL_init_ssl ||
> check_lib openssl openssl/ssl.h
> OPENSSL_init_ssl -lssl -lcrypto ||
> - check_lib openssl openssl/ssl.h
> SSL_library_init -lssl -lcrypto ||
> - check_lib openssl openssl/ssl.h
> SSL_library_init -lssl32 -leay32 ||
> - check_lib openssl openssl/ssl.h
> SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
> - die "ERROR: openssl not found"; }
> + check_lib openssl openssl/ssl.h
> OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
> + die "ERROR: openssl (>= 1.1.0) 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 &&
> --
> 2.39.5 (Apple Git-154)
Pushed as f256487cd8f29f24036efa5d91a84a26b048861a
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
