From patchwork Tue Dec 19 17:51:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6868 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp1869329jad; Tue, 19 Dec 2017 09:51:58 -0800 (PST) X-Google-Smtp-Source: ACJfBosg+LKEURwBbVJReKLjmMw1jEbo3YeYHLz5r2CxPC02ReuKc3FuxORdKxxFqZ1SSITD56g1 X-Received: by 10.28.8.212 with SMTP id 203mr4233926wmi.8.1513705918222; Tue, 19 Dec 2017 09:51:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513705918; cv=none; d=google.com; s=arc-20160816; b=Gw8hwtkPmE6RwKYMMoGFdiSrq0/9cPfEJ6DpAk6FK64LEFlz/NNYsIaKrL9gPOIlfH 4EqfVtNc9NT45u4jtLZ1nksNrWP8QXwU90WhzCyC0tRPDAO+gerHn9ujPDBvY+7cA2Kx Fvsl5pUF6NdAT4Izdn5yTVrQX3P+nTMJgeav+lf8607ypzxXj6EwcqZf1Al3Y0b1oOIy jsSyJMdejP21K9HQlTof7yXQ5Wm48IOpMJXI4mDWaH2u50hU7lXd1mwcUlGva7f5le3Q 2Rhq/L7ucNMnlG2hPqcjtwJJocPWq4ksPqV5t4PJE8d4WZKS9uN/afie8EPbHGdlqcCR 5dYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:spamdiagnosticmetadata:spamdiagnosticoutput :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:to:from:delivered-to :arc-authentication-results; bh=aM0mktItL7E8I586J7rZwD6UOoi/g3BKteq+M50V1rA=; b=LkFE1MRxdT8XafYMiLK9cbFwPVCz8MMdIedcpiAqnc3iF76WzdNX4JzmJhBhVSAam/ IRcdFcl2ZubA+LzJi1bSoumht42jZS4EIhUhrxXonQ+rhIOQ+z7UpepXTLvf/Vh7m0rM JIKnghbdE/lbviVo427Zn6ogooLovNZFw0bPklCi+QwE7tSsEzpg4Fzoy/iw2nobc0MW j+T2sI5jnlvEWmLZEnBV4ejO2BLAthVcM35xPkp0p7ySs60zg8AWFTMu9V1rq1lWMNS3 rLLvjTEhjPrvUItoYr2NLBrti2lLBU+ifq0fCqbabH42F2RzznfExy7nxistwZmKBmn4 0OwQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s14si1624729wmd.191.2017.12.19.09.51.57; Tue, 19 Dec 2017 09:51:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1881868071F; Tue, 19 Dec 2017 19:51:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065044.outbound.protection.outlook.com [40.92.65.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C738680673 for ; Tue, 19 Dec 2017 19:51:38 +0200 (EET) Received: from HE1EUR01FT020.eop-EUR01.prod.protection.outlook.com (10.152.0.56) by HE1EUR01HT151.eop-EUR01.prod.protection.outlook.com (10.152.1.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.20.302.6; Tue, 19 Dec 2017 17:51:48 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.0.56) by HE1EUR01FT020.mail.protection.outlook.com (10.152.0.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.302.6 via Frontend Transport; Tue, 19 Dec 2017 17:51:48 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::1da8:b45a:3ec1:873]) by DB3PR0202MB3452.eurprd02.prod.outlook.com ([fe80::1da8:b45a:3ec1:873%13]) with mapi id 15.20.0323.015; Tue, 19 Dec 2017 17:51:47 +0000 From: Stefan _ To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH] configure: remove libtls fallback check Thread-Index: AQHTePIKT48J7jBRn0WXLyiqXLvrIg== Date: Tue, 19 Dec 2017 17:51:47 +0000 Message-ID: References: <8dfe03a9-9568-6b53-7a28-1332fd79643e@gmail.com> In-Reply-To: <8dfe03a9-9568-6b53-7a28-1332fd79643e@gmail.com> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:D0F9EC030145AE8EE0000FD97730B6F0B3618F4337D6AF605264E7B18355C5CA; UpperCasedChecksum:28DE3F98DD5AEEF5E78A3D8DF55806C7A0E30A166A3D4663431C90743559D474; SizeAsReceived:7238; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [3mgyRAXGp94TukRzm3U4YR7MzUsRw6UK] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR01HT151; 6:qNDqaebV3NMVktjCSglsZNJFrGYwaJWLDTRj3PVDO0C0c2sfYTz/HfYC/Y1dyK3r368u0j3prf1AaT/BztDOPA7BvQzKp3hUsLXxWJVCY3BA7qeKW9GJPEQIEjuaoJlKP7eq2fpDxjApJIRgXVk6X3VoShYOFwzYK+mhWOExAyXHgpkb609AI9oxtFVH71EQWIMBJrmUh9DQiiyjKLSgCNS348fOOppbEPz/eWvLJdM4MZrRFgMIgql48gXwS0d145px1dnoheqLJhIiIJJ2SmRbEsDMv2TrtNevknINXWJWr/2LAtrX9zfkOJxvAulDAb1rein7bXPCxHKG0ecnC8farCPGLN5zylX9OtJtVZw=; 5:Q75J1pcKL8SqaWU1P4ee2Gx8W4GXBA7eTSC2iQW1AQbY3FWPIbGPV0F2B0eW76OC/rVfNRD0V6SrZsHKZ0I83Qh3BbHNMHnSdvqDldYsFvuHmgErOSS7N4c4dTplTruFu2T+IGCOTtnGjD91EQvi/ALAtm5AQnHCr1bP7cHkAZU=; 24:aFE0VvMjSnGX/tT9kcV8GVzkVXwVqWiQ/U67SeRoizfdmhrJao30yg4z9K+tcg4wxYzdIVP9kh8ltZGUsJ4HpDHQHqb8TvAtO+iVvCMx0cA=; 7:10AMpvse48Y+PhElY7pIgzCHxjUQK9NhEwTThQZ7+2eq5WpbRhBqG7/OEGNnV88D6emJrC9W2TLambx52GBmlyUlWhe/UTw9eSdaPEAiuV68pPvhFKFfcGLRbruj+KZf9dQpCDPuaJZSRfyyx+K98F76cPooglRvpyWOohO7KzHsN85fRzyqRL2oeH7uoSwJ9Yyfc21iD1Ayiu7vQ6pXOh5cBu35Ftu4PLrg58EA3s7beJ0KhFwjTj4Fk2Cbf9DY x-incomingheadercount: 46 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:HE1EUR01HT151; x-ms-traffictypediagnostic: HE1EUR01HT151: x-ms-office365-filtering-correlation-id: ab0aedd9-4af0-4abd-c4bf-08d547092cd5 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:HE1EUR01HT151; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1EUR01HT151; x-forefront-prvs: 052670E5A4 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:HE1EUR01HT151; H:DB3PR0202MB3452.eurprd02.prod.outlook.com; FPR:; SPF:None; LANG:; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab0aedd9-4af0-4abd-c4bf-08d547092cd5 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2017 17:51:47.8871 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR01HT151 Subject: Re: [FFmpeg-devel] [PATCH] configure: remove libtls fallback check 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" On 19.12.2017 at 18:28 James Almer wrote: > On 12/19/2017 2:13 PM, Stefan _ wrote: >> Last patch had a minor issue, fixed version attached. > Applied. Thanks. > > The fallback check for that matter should be removed. It's pointless > since every supported version of the library ships a .pc file, and it's > pretty much guaranteed to not work with static builds. Sounds reasonable, corresponding patch is attached. From 0224270196ea9329dada21b86848a899c995cc74 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 19 Dec 2017 18:45:27 +0100 Subject: [PATCH] configure: remove libtls fallback check This check is not needed for any supported version of libtls and causes issues with static builds (libtls links to -lssl -lcrypto). Signed-off-by: sfan5 --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index c01f414f9a..1b07dc2ce7 100755 --- a/configure +++ b/configure @@ -5894,8 +5894,7 @@ enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init enabled libtesseract && require_pkg_config libtesseract tesseract tesseract/capi.h TessBaseAPICreate enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg -enabled libtls && { check_pkg_config libtls libtls tls.h tls_configure || - require libtls tls.h tls_configure -ltls; } +enabled libtls && require_pkg_config libtls libtls tls.h tls_configure enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } -- 2.15.1