From patchwork Tue Dec 19 17:05:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6866 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp1817638jad; Tue, 19 Dec 2017 09:05:55 -0800 (PST) X-Google-Smtp-Source: ACJfBotVjz5dCoqFUiZj1yVmgnMU3XZWrwogxfbrtZpmR6Epz24HjjoCMO/ecTWFfo3GEmCWnneF X-Received: by 10.223.165.19 with SMTP id i19mr5944751wrb.33.1513703154942; Tue, 19 Dec 2017 09:05:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703154; cv=none; d=google.com; s=arc-20160816; b=bP0QmsS07/b653fz+bzofBOA9eLPp5dIIOfRM0iwBdq4XpbjkOotAMItTdgQIPt6A3 SKJrrw5qdJqEKH9gVDZ20+oRiO9nJjf4IbT+peHVF0/vrBLUdpGeL4Qv2u0F/Yj7mXPU 4sdyPMuRfVd/SMw43SkI6X44P0qKWbMbzY/r7OdNZZ92BbkCK4ovHq3qYPX4o4aGttmG aGkhFAvOZCY5v+LI0ImtDuoyCBCJtkza4dzWqT+TRRJG7oUFqresd+ubO4av/WDy18BW rx+W61rvIE+1QdWLqylscMts19JMSnQP9D2eKzHFC9joWfyVh/e6dE9GsddN5kF/LCLQ o9BA== 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:message-id:date:thread-index :thread-topic:to:from:delivered-to:arc-authentication-results; bh=2c1TUYe2ft40Sd8EfQk3QTApbSQ6DAuzGcNpsklr2Vg=; b=FUTyMPj7UwUJgcOGw169sH2ZtNr95XS4Rc39LTXM+RTMz64ccELgveDFRRRZmF7bpO DbalWvpbzrgm+SLfXXPaAZk8utfYpuajcIPBAMnPOTRXxc0awSYA9gJ5Lw1yXnTfByoy fMTXxr23fnjufV0Wqhx7kgbLmutRgsCx9Eyyt9M0MEyy0gnb2Oi3sYMvPDDddsu9cvGw Io09M5BvVjzoy73EjvIx06sTTBklMjTU0dZDSOiYvIXdFVPUrDQ/FRk81hp+GHMlErT0 9YG0IloSWb7QiQYNAZ0dNM4dPCQEHk8UPzBOj8zv+jXryV9aXuLs3sF/ZeOki6qYGVXM 2Reg== 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 a21si1475295wmg.82.2017.12.19.09.05.53; Tue, 19 Dec 2017 09:05:54 -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 DA16E689E52; Tue, 19 Dec 2017 19:05:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070040.outbound.protection.outlook.com [40.92.70.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE0EE68832E for ; Tue, 19 Dec 2017 19:05:35 +0200 (EET) Received: from VE1EUR03FT027.eop-EUR03.prod.protection.outlook.com (10.152.18.60) by VE1EUR03HT143.eop-EUR03.prod.protection.outlook.com (10.152.19.207) 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:05:45 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.18.55) by VE1EUR03FT027.mail.protection.outlook.com (10.152.18.154) 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:05:45 +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:05:45 +0000 From: Stefan _ To: FFmpeg development discussions and patches Thread-Topic: [PATCH] configure: fix pkg-config check for libtls Thread-Index: AQHTeOub639XezsbYU+lBhat43gW+w== Date: Tue, 19 Dec 2017 17:05:45 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:EF8A86E80B821E6D9ED4EB22D732E6AA32B9F44CF08F582F8FE7933FD85D47E9; UpperCasedChecksum:97BA6728CCF09727BDCE725C1FB5759EABC8A53F2767C5EEB0F8FA98A9BFEC35; SizeAsReceived:6935; Count:44 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [wLS50h4t1fM1FUqgvnEEc2QqQ6+9pTYi] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR03HT143; 6:wK2ByQkTmgFy2s42WB2VP7RZICgF+0b4SVStEKdW9bU9ss9/oabRW10/tAiqaZntWLdS5sq2zw3WvK09jXN4zJS1cELdwWXAMYfOZ7PHGX6g7eAwKtpuxhE9XOpJzfU1/uyveICrcgAM9Wr83ur8GWFOpnUtiibOeuw3EQfCDdnjh+lJqio4cdb26rTpSAZ1q+xG+1xgWkvqY7AYwy8uU6UNvm4Tkk4IpqfkNJag8wjCg2TG6EVUZaHea5dsM6cVLS6VHCZvxOZuUi1Sf4nN9r9wbbzRfwgzQera+tGyaLua1FEzpuQmlplZAJeCyPfkmvb2ECtfkf0ede0e29rdw+/sysLirY4VT33IRvQE2ow=; 5:nSwG0Ew00IPKAlxjgPmiSsTh17nxwUO4DtCqZfhJdDyHAciA8S/P65yQWc5xrKb6o0EdC0krWZemIMGF4nT8p1YiUmOHXAWC2BQu3Bk9qLJmHF/FEhAtvH9qlCJN2u12Uq3yDnLDHZ2oH/d8wJYYB/yRrh/K0gXOu8GuuG0E+OA=; 24:1vFDsjJeR53pA+lDas8JdO6o/nsRk2GlFapZyCbXsawxjPgddLLvdLg7dq1zuVekuYH47IiCPwnDkwtYFnZfTPXC51t8QgLXZjtqp9jDmMw=; 7:z6g5RGCA7wFG528CDZT2wd3cMDWR7DMptd1IFEcqqpehCGsZZtdyDs4AqHGan6RzE7i9TCBpQHIMxUb1Z6DkoPpf/1tDu08C2qgXUfn9+44Eo6l3F7jiwmZ425mzBkCbzoyQ97WkQMoDN3HF8iziaxVdjQXLVXgo3MCYlMNzuLwVhVT8REBlMJxW2/kGAEaSL7kKtAXoQUYvbWqY5UZYsWffsGx3oQsESCLPOd0lUX4O1TqHG+rWb2xlKeQNPhJx x-incomingheadercount: 44 x-eopattributedmessage: 0 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(201702061074)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031324274)(2017031323274)(2017031322404)(1601125374)(1603101448)(1701031045); SRVR:VE1EUR03HT143; x-ms-traffictypediagnostic: VE1EUR03HT143: x-ms-office365-filtering-correlation-id: 91c8b35a-85f5-46b5-fbd1-08d54702be13 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR03HT143; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VE1EUR03HT143; x-forefront-prvs: 052670E5A4 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR03HT143; 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: 91c8b35a-85f5-46b5-fbd1-08d54702be13 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2017 17:05:45.2905 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR03HT143 Subject: [FFmpeg-devel] [PATCH] configure: fix pkg-config check for libtls 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" Hi, Attached patch fixes an issue with the LibreSSL pkg-config check in configure. Between the creation of my libtls patchset and the date it was pushed, a refactor had changed all invocations of use_pkg_config to require_pkg_config, resulting in pkg-config never working. From 0afe7b4257f55ccfd00d65861c33ff693d2d19b3 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 19 Dec 2017 17:33:26 +0100 Subject: [PATCH] configure: fix pkg-config check for libtls This was not accounted for during merge and is required due to the refactor in commit 93ccba96df6340249b0db227d5bc3297010797a4. Signed-off-by: sfan5 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 2f7db05faa..99f6147ba7 100755 --- a/configure +++ b/configure @@ -5894,7 +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 && { use_pkg_config libtls libtls tls.h tls_configure || +enabled libtls && { require_pkg_config libtls libtls tls.h tls_configure || require libtls tls.h tls_configure -ltls; } enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame && { check_lib libtwolame twolame.h twolame_encode_buffer_float32_interleaved -ltwolame || -- 2.15.1