From patchwork Thu Nov 9 17:31:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5998 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2314677jah; Thu, 9 Nov 2017 09:32:01 -0800 (PST) X-Google-Smtp-Source: AGs4zMYD4LD9OOrjYR07R7PyI7z5HikjaSGXSGc96J+dGxJlWp5UDSJNtkMA9PR0r7SfAgZp6rrU X-Received: by 10.28.230.208 with SMTP id e77mr553387wmi.86.1510248721785; Thu, 09 Nov 2017 09:32:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510248721; cv=none; d=google.com; s=arc-20160816; b=gI19WxUS52+G8KdJKiDqQti9aQuUPw/8bsjGG+eYvxLziU8dowDs5TjUjnyyNSypg6 tqRSde6wI6Ji17LV6kNEUZtCDJjSC1EEt8kdC8fs15aW+yRStgP0Gu12PaE6mcaSS8g2 MNGYzfPm6FhX5DN8g/PJSRZQtmOt+nCpdf5XDyuHGfoB5HjSLea4tL6fhOomD4AFked9 w1yrLvmRbbB0Fb3lLrgIpjeiXh7eCyuTyFBvpwbBuXmyXmJF6+/tRU/kgNOFVrtv+v1y FTkez1ZELitf5B02/zaxIHjhX/F/6zWY/t1WreN4IY973S5PN9fskRz2Z2wElVgYht0h vkWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=gPhc69kQBm9Yw+sYL9Ro70SZ28Dh7vH1Nv5BCcZE7lU=; b=APLWwmfRNZG9xJRyBclhQiBHev2J2ClmTpxD5bty/IEmals+cWKLd85y5iqMbt9rTA FyLauRzYHQZCmmylhOSygR4uCeD6wofOA3H3lkUCMBH1+xCS/Ln1rpKOntyfjBkTqiSx RFEQnHcMCMC+pWvAFeIko1Fdc9q0W9OzTezOj1G5+C/Xuyyw4d43WUy303ELueRhUMJ2 W+LuaXB/zWz25hlCiBp6ukj96lhK8Jv6Y1BxzYV3VYIZUqDRCt4/tz1Oio8Gg2BdpfnT IuKWN+5xuVZxD832me12aD9ZjYZMyyomvJ9i6MZYOtb1Mr6UUqToWs+W4TxZwDlvBR5C vqrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QF8wJP8z; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k65si5814485wme.111.2017.11.09.09.32.00; Thu, 09 Nov 2017 09:32:01 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QF8wJP8z; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A258689CF7; Thu, 9 Nov 2017 19:31:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E51B868975C for ; Thu, 9 Nov 2017 19:31:39 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id f8so8632595qta.5 for ; Thu, 09 Nov 2017 09:31:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=SG+B4/uDDoMGhE5xm4VGnk61HnieYSuIEXN8CXwChh4=; b=QF8wJP8zRknJ2cjaAc0uYIuw3qlwEJVdkrwL89llqBhDmWGY2zo/FxMabkEl/37qzx QvtNEEYqT6nMY36dpFPhrUpGHsYJ1BKaQwMoSLb5hQEiL3u/0i0xOAhWWIOMIuKCcVHM ReaTrkfhUfmWH/OvvS3pZPW8xtsHylhVERTIzyR3krvKcS3No8zEA4o+YBZ40/4Y0iGB sr7FeFrOb4PxxCit7LHfVQgBNy3cBy8YyyO8R2NPYtl6wIlV1EjYTPM7XYc7GLinjHm8 2+XVJSz+eSyNNNCRkw+mCqmg4RHViyWlLmDt2lqD+EB1tb1dg+wSdMWbOidae5liNeY3 rY1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=SG+B4/uDDoMGhE5xm4VGnk61HnieYSuIEXN8CXwChh4=; b=ZT7pMQHxN8GTMVEh1kM58UqpQy771HRkYZvPkW3D94ozqs6LK93bvGr8nqQZY+ruGC didAEclqVFLqOoRdRGDDkLM8B/1BpocpL1oTxLCUmfDxapmNAblmUx+/016YjvaDrnNV F9PhBynJvZoxBg7J+ZDBWfxwIYMngwRdTXkdb+TE4cECUkcmPWwQrOpgI+ntsTzhET2d FpVUOTRd9gWV0op00stVg2DikD2Z5KA2Ud0uitR5sluXViQgBqWuZ6cUZPmCiQsu4bX9 /qBH+pTTo2A0x4+PGHJmJ//E9bWm04JyOSrkeg2PpCFe4jtvb75Y2CDQZF2KTAB7B9ce mg7w== X-Gm-Message-State: AJaThX4r2J0FYNJ9WweKWDVckzFSSo+1kef+cgIlyrljzz37NSSxKO0Q RypKwhJ2m618gKsfE+PLTkKQpQ== X-Received: by 10.237.54.34 with SMTP id e31mr2066804qtb.77.1510248711859; Thu, 09 Nov 2017 09:31:51 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id z75sm4860506qkb.30.2017.11.09.09.31.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Nov 2017 09:31:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2017 14:31:31 -0300 Message-Id: <20171109173131.5524-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] configure: fix the non pkg-config libmfx 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Based on a patch by Aaron Levinson. Signed-off-by: James Almer --- Untested configure | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f396abda5b..7dd540bad3 100755 --- a/configure +++ b/configure @@ -2772,6 +2772,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # hardware-accelerated codecs +libmfx_suggest="advapi32" omx_deps="libdl pthreads" omx_rpi_select="omx" qsv_deps="libmfx" @@ -5824,6 +5825,7 @@ check_header asm/types.h # so we also check that atomics actually work here check_builtin stdatomic_h stdatomic.h "atomic_int foo, bar = ATOMIC_VAR_INIT(-1); atomic_store(&foo, 0)" +check_lib advapi32 "windows.h" RegQueryInfoKey -ladvapi32 check_lib ole32 "windows.h" CoTaskMemFree -lole32 check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32 @@ -5981,7 +5983,7 @@ enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kv # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. enabled libmfx && { use_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h" MFXInit -llibmfx && warn "using libmfx without pkg-config"; } } + { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } } enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libmysofa && require libmysofa "mysofa.h" mysofa_load -lmysofa $zlib_extralibs