From patchwork Tue Dec 19 17:13:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sfan5 X-Patchwork-Id: 6867 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp1827055jad; Tue, 19 Dec 2017 09:13:49 -0800 (PST) X-Google-Smtp-Source: ACJfBosFm08VCI+VXJmy0+PaDF3I9g/Pe8V3mF5GLONRs3X6hs89ckeRW9TE1/YUEW/YhJp/ARjx X-Received: by 10.28.217.75 with SMTP id q72mr4167702wmg.9.1513703629412; Tue, 19 Dec 2017 09:13:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513703629; cv=none; d=google.com; s=arc-20160816; b=pGpgYSiiXmAQlYkR+9cYE0EJARKObA3bOwWQGbMahg+/hP9tdBuwtyt516hf+WYrfV GqJl+NjhmZJw1xu/4zvpQY+XKVrMeyD8UGqCEkX3ZgeBo3QvQw1tEjdt1X3KDIRtsh/9 6FYfvxFLrJxEpKjBw8cys+pYXwUU5s/gMxfxv9pAL96NIDsFnSg5ggQOV5LyjgHc01iv r0yHhSY/CRXpakIruHSQdlZPIqbRnxOMhDRhB59VfktoGHPob12NyyilTYF4ifE+oEPy pRmdHYzzEkWgaLq75wyNtVa15dC686kkoufaEqRXkFTsgH2HNeZAd3OvacXTNcp8YHlg VLMQ== 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=Js4lnUwfscAf4BZPe+1B/xt9qQYr3QGOqpuU/aDPKAQ=; b=rsyjMm5ximAjPIj38nQFD3QDDUtgwrJi0JN8wl4O/s9zJA3/9YS2f7RoXtU5oXjtQG hR8DjzjD0bdEiXwd2YKXzZFkhn2nLFKWwYlEqYkC6OeafCCDMQ+Dhv4Lk4+37OC626aO rZIdY2KpaE8hnFs46U1A9mmCvDj47Utf2SVdac6XvvQyPBGE+MOJ0a0fHwSnsm2+12uw uVu/B4PNyxII3wFK6PslyRu6Bi1xuIVUZYonro/YehDjMFl/mdDg8CcBI2wuHUHESZXi TSjEHQl+ueOJIz9v4ZVV59K/cKfLCzRP+XxMjeVcA104OZ8vlEDXbegs2kJhpw7biRwl vDzw== 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 q7si11037417wre.60.2017.12.19.09.13.49; Tue, 19 Dec 2017 09:13:49 -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 1EE8A689E50; Tue, 19 Dec 2017 19:13:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066051.outbound.protection.outlook.com [40.92.66.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1958E689B06 for ; Tue, 19 Dec 2017 19:13:30 +0200 (EET) Received: from VE1EUR01FT029.eop-EUR01.prod.protection.outlook.com (10.152.2.54) by VE1EUR01HT092.eop-EUR01.prod.protection.outlook.com (10.152.3.143) 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:13:40 +0000 Received: from DB3PR0202MB3452.eurprd02.prod.outlook.com (10.152.2.51) by VE1EUR01FT029.mail.protection.outlook.com (10.152.2.224) 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:13:40 +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:13:40 +0000 From: Stefan _ To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCHv2] configure: fix pkg-config check for libtls Thread-Index: AQHTeOy2BqZzt0SuT0SFru6KomG5nw== Date: Tue, 19 Dec 2017 17:13:39 +0000 Message-ID: References: In-Reply-To: Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:FCD3734F3136C2E7B58F1EC6CBF39E116247487AFFF24CBC71D887C10007F136; UpperCasedChecksum:63B85D3BACD116FEFCBA48D9BECDB3CA07E69489852352AC3A578837B3762D23; SizeAsReceived:7150; Count:46 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [gbWsE5SMVz5GSmsefXkYBidLz/m/ZGKO] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VE1EUR01HT092; 6:qgWcFQsCP6eGy9Gv13BynPMFszUOuKyzFg6L8LXBK6s5j0dc3F/H2ct40wBQQzyqlB7+SwZwrsbxLjAEi/u4gw5TMAUmG77w9TP3mAa7vL54uJTAnwc6s9ZttBdCyGxC59Ijyj0OOVqGsm/BZhY+lOOH5pAMi7y1+xzi9pFcgn8M3fFlDQDOpGIuV02PHXVmK1wHCQLUsZ2tXs8/gCJupMYFInnYMVByKUF+NGyqRVjK/AjYIyhWfF6mcgtDPzsXe7SUln/s2fu3JCenF5pKjrI1KwPvkwzEO+gYr6SdeuNLvaIyPsUd1lTE+tjZcHc/E2BOWKukYyCxmM49QaLeTRHy4kptrCXAl/SKe2w0sAU=; 5:clYK9pnhdf89BzF25I0EEgslCi6D4fTK82jKd0TOgMRjpXmyWlLyQUQhdjBVZHyJ21jRUJHhPK4o8AYQGO3Um8RY8321e55BFvoxhSFOTFYyd6zyFkP+qorXnuk95xaEVoR/wVY5AHdvqTK1Hi82sFZflNEXM0+dQJcUjjAJFWw=; 24:8CXBZ1vMMFopvDhLi8gLQVsFoNG0YglrxWTNFhhWNpVbydHrvP6iQ5Y1F/Iml6fazf+ZQq3ebFOu2Bt0Nqx/rbYTJWSkN9UoCsM4H5MtmkA=; 7:V+s2NyPOXyJqTtgl5afvcG07QJIW8fJzelMjhCLSVJlMYcuwS+BCsDbK4fEcL8ZpfmdVTmUslAr+bdWLE0UTWI4++/Eo7S5NGrjcJdEvDiqYJNiFWFVqxSdRtEZsejaGXu4p+8805VU3k8Jx6nbvczBhYpY8UIG7BxC5LgLiUUhhDqZKh8i01CCZhxa3J1bri8DSW2zmfsbCDYeu8VhD2ATzL0tEiGIhhIKSsaJbzxClUnUx3cGAqCdNPhzciYcg 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:VE1EUR01HT092; x-ms-traffictypediagnostic: VE1EUR01HT092: x-ms-office365-filtering-correlation-id: adf164ef-9b83-4565-2e0d-08d54703d92a x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(444000031); SRVR:VE1EUR01HT092; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:VE1EUR01HT092; x-forefront-prvs: 052670E5A4 x-forefront-antispam-report: SFV:NSPM; SFS:(7070007)(98901004); DIR:OUT; SFP:1901; SCL:1; SRVR:VE1EUR01HT092; 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: adf164ef-9b83-4565-2e0d-08d54703d92a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Dec 2017 17:13:39.9656 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1EUR01HT092 Subject: Re: [FFmpeg-devel] [PATCHv2] 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" Last patch had a minor issue, fixed version attached. From 6f6bcf77ce2aaf6a84858d34112f61128e779fda 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..c01f414f9a 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 && { check_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