From patchwork Wed May 25 16:39:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp1164112pzj; Wed, 25 May 2022 09:39:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPedQimlb+uFai+tERm1LjG7b5lV8I0z7n1EwkssH6qSPM32EL3AoUecejSAQIW0wqdwnn X-Received: by 2002:a17:907:c05:b0:6fe:cea8:8c4 with SMTP id ga5-20020a1709070c0500b006fecea808c4mr16476469ejc.740.1653496755464; Wed, 25 May 2022 09:39:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653496755; cv=none; d=google.com; s=arc-20160816; b=A8/+57EKyzW1Fb7KOBj+lE/bIwXSn06+uvrcLYoLptYztJSzmW2PgpLsGY5Hn1pKyM VgqpdQCNzAkWy8nUpWvx7jd4FOw3tzxb8TKvqnzUYJz7s0JTdUccTx/BptYiSt3cRQyp DF8bj5ZII1yBPBrtcDRD5W8OdbozISem3iIhMYp8izh9/C70IB7zydNBZBflK3ieXTB9 d5Bff9jHt1d7Qim+E63336BE1kfQTzeUgbMjhKvlDgPpKeAszGadsiWlFMAZkMpe2kS6 pbRhPXrRNqxiYvRLHE56QcIqzvDrmbtNn2ePoHQkPYHVB3GC/s9Pv76CXmwCdA0oRmmy xHXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=2ijdw6ER2tsplLWvVp6cRtrzYNMJNGHMUSwAmwnLtzI=; b=aZe7LvdayE0DHLyqOMn2M1pvJg+8+Aoqn8TzuwOPAMkjirzC45XBDNT2rhQwCi3cB4 pOVcLZwIimIRURC9CRc9ZIPfzPv8qJqdeJ7gQgpHJ/fqhaPpv6C5+hDGN8kRtJAoJ+PY gfhnNhY0pUPlW/rqonH3eSNYu/y4uis7IBY6qMC8Mz0PTI0Wpil8fcXt8zOxaOWr0t+V dmcL4hZhvG2Whn76DiF4SNtmrQhSqGcDpwiV/yXTxiCt40OItvoxFBfl0T9nDDf+vV0s UwaOKfWCbu9Ot20/fRM0l1xrE/KoLeWTlSksIw8KQcUpge5J4B5HmEJqNucKXBttg43Q vB5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=AtWXKarR; 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=QUARANTINE 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 r10-20020a05640251ca00b0042b2c6c56f7si19203880edd.559.2022.05.25.09.39.14; Wed, 25 May 2022 09:39:15 -0700 (PDT) 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=20210112 header.b=AtWXKarR; 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=QUARANTINE 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 4285E68B53E; Wed, 25 May 2022 19:39:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f47.google.com (mail-qv1-f47.google.com [209.85.219.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5650D68B4F1 for ; Wed, 25 May 2022 19:39:04 +0300 (EEST) Received: by mail-qv1-f47.google.com with SMTP id e2so656461qvq.13 for ; Wed, 25 May 2022 09:39:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ubCuz9U9StIgL21zR4h2v+1I0Ggm898viL9oUU1LMY0=; b=AtWXKarRYRzjlxrZtZbDtWY0b1MFeoZpqtPW9uqs7XNZ1mPHNr8fKjt1uhKBOrVgn7 5MVmfiB8wwKhIvuC24jFmr9gdmgwrgFtSGuLOWOmkXaBFcHLwDdYM1691t5uUJNPzu/2 9qRWOsEPLlTG8vOHbl4Qr9U3J3kwF3dOER7LRaD4ownUPPO/ZLLF9NIVftnyVV7hZcv3 JkjvgXoaK0LguetwG8SG7gKnrpf1zSO+9rBdHTM0HhBNiPr2X4DJgg6LJV/o91fmSF+J JqPxXeofYmWXW0T9eKArCAczu7a4DHUUib04V5K/kjtmJuAaNorhLOP1z07+6h2tSaz4 LTYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ubCuz9U9StIgL21zR4h2v+1I0Ggm898viL9oUU1LMY0=; b=SP5UGwkyFkvW3MF0XU4y/ajudD/NZXssWYeMCrh3FG9jDUuipUNLBMpyRGOxc97HIh ymLBns5urwVe/zI+b/VoThchCcml2oRMq7UJwin1qz1n+6o2q9tjBius6h8YY4PnHBpb onjCAWiYZxIrafFUNsGN5zCDEhb5uDSRIeLYyRuhvLxr9NjEGMNbpKKiFNFb7mNYSOHH GTGo9TjaOFRyBc+/EXo2K7n47tnd+AqQX+gKDXX9T2gxbLB+ifw2timQBMZX0WCx4w/8 M8GaEIJj+9jToN2srKMiB3Ia1g6nAntIbbUWQ5gApej8U6m0lI7DUjJAh6t8HlIiFdfX Xw1Q== X-Gm-Message-State: AOAM530APRHcdfQpFEgdsoVrWfqdm1uNQtvL7Md8xMhGD0Nq4WiMKPlc w0JX4hIHxHFQY2zEEf5GfhAWVjxv4Gncxw== X-Received: by 2002:ad4:4ea8:0:b0:461:f30b:d585 with SMTP id ed8-20020ad44ea8000000b00461f30bd585mr26364837qvb.22.1653496743046; Wed, 25 May 2022 09:39:03 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id t35-20020a05622a182300b002f940c06d93sm1788998qtc.16.2022.05.25.09.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 09:39:02 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 May 2022 12:39:00 -0400 Message-Id: <20220525163900.1128028-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: fix libmfx detection with mfx_dispatch X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tvX9JhPoQBpU libmfx detection changed from libmfx.pc to mfx.pc in commit 478e1a98a289bbc777bddc02fdcefeaa3c416a63 but it is not installed by mfx_dispatch, which breaks builds that use this library. This patch also fixes the fallback linking to -lmfx instead of -llibmfx (which is incorrect). --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2337f0a8f2..90a18d7783 100755 --- a/configure +++ b/configure @@ -6566,8 +6566,8 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_ # Media SDK or Intel Media Server Studio, these don't come with # pkg-config support. Instead, users should make sure that the build # can find the libraries and headers through other means. -enabled libmfx && { check_pkg_config libmfx "mfx >= 1.28" "mfx/mfxvideo.h" MFXInit || - { require libmfx "mfx/mfxvideo.h mfx/mfxdefs.h" MFXInit "-llibmfx $advapi32_extralibs" && +enabled libmfx && { check_pkg_config libmfx "libmfx >= 1.28" "mfx/mfxvideo.h" MFXInit || + { require libmfx "mfx/mfxvideo.h mfx/mfxdefs.h" MFXInit "-lmfx $advapi32_extralibs" && { test_cpp_condition mfx/mfxdefs.h "MFX_VERSION >= 1028" || die "ERROR: libmfx version must be >= 1.28"; } && warn "using libmfx without pkg-config"; } }