From patchwork Tue Jun 9 00:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 20223 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 07AA8448C91 for ; Tue, 9 Jun 2020 03:14:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7EFA68B2DB; Tue, 9 Jun 2020 03:14:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from so254-54.mailgun.net (so254-54.mailgun.net [198.61.254.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1FBE0687F7D for ; Tue, 9 Jun 2020 03:13:54 +0300 (EEST) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=rcombs.me; q=dns/txt; s=mx; t=1591661635; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=deUqvZZioNdsqzizkcVT0QqH7NQeTVdxFoPXtjqfGWM=; b=ZquUhTeaoHayOyp8fNbO5x5tRv0z2Ds/XvJXmux7KEc6Up/E9RGMVvKnvpp8rY+7KgmiZl9T EV3PRJ4jmHPrdSBjQwK37xN0UMtvc5un7LYmuicNqiMa0hzu6FfTKwQm3z7Q2A9ZZeTCJd7i Xp7AmmN2f6XV55Phuy/VNtmwIfU= X-Mailgun-Sending-Ip: 198.61.254.54 X-Mailgun-Sid: WyJiZDU1MSIsICJmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZyIsICJiMGJhIl0= Received: from rcombs-mbp.localdomain ( [24.14.135.13]) by smtp-out-n11.prod.us-west-2.postgun.com with SMTP id 5eded43c60667f2e2fa12195 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Tue, 09 Jun 2020 00:13:48 GMT From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jun 2020 19:13:40 -0500 Message-Id: <20200609001340.52369-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: allow OpenSSL>=3.0.0 with GPL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8569a60bf8..cbe8b25001 100755 --- a/configure +++ b/configure @@ -1731,7 +1731,6 @@ EXTERNAL_LIBRARY_GPL_LIST=" EXTERNAL_LIBRARY_NONFREE_LIST=" decklink libfdk_aac - openssl libtls " @@ -1820,6 +1819,7 @@ EXTERNAL_LIBRARY_LIST=" mediacodec openal opengl + openssl pocketsphinx vapoursynth " @@ -6469,6 +6469,8 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP 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"; } +enabled openssl && enabled gpl && ! enabled nonfree && { test_cpp_condition "openssl/opensslv.h" "defined(OPENSSL_VERSION_MAJOR) && OPENSSL_VERSION_MAJOR >= 3" || + die "OpenSSL versions prior to 3.0.0 are incompatible with the gpl and --enable-nonfree is not specified."; } 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 &&