From patchwork Wed Nov 24 19:19:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 31631 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp10961917iob; Wed, 24 Nov 2021 11:19:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxPgN+3S1JysA8Va6SQUdmXgrI2eAFjmncm34RXO3jhiJUHC6E6+OAYt3nBwg5eZ8Hu/56I X-Received: by 2002:a17:907:d94:: with SMTP id go20mr24379835ejc.78.1637781564586; Wed, 24 Nov 2021 11:19:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637781564; cv=none; d=google.com; s=arc-20160816; b=u/vax5vKCj7kgEDcN+TUjw16SiQPW7hWoJALUVjM5S1XzDu75OVESzA3QdLSUlJc9g LrYoA+cjBloXPLEsY3SWqyuZ2aORVd86fEYUT8ExkDShNrrrW1e6w/WY95VWbKu6N9MN k0J5YUMTQdf82/p26dY9QXq/UNF+yuR7wDjYvXLDqRkhAIdj1Ha72oUFnZs9RLylSdjn KeX2D3w2/wC2nuWZzvABlfghX2LFaSdVyKeZBE0NQtw90j2plyiF3VwfYi1WBAXk+7zz pYlTMGj1Kw8pvqcfuuobUo+Ap/0JHeqEaYs6OoMG+HpoD+gXn6r0kXX7fPO73F3uRQMI 9jeQ== 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:message-id:to:from:date:dkim-signature:delivered-to; bh=MkNBr9IBuKH3teMFh77t3ZBKmPZJB8rN1BFGRQlnSEo=; b=as4iphn+pHh+DlGWAi4BA6blUG3YcFW/9DbBUVTDWwb5mDi9MhNWYhGVmt7Tf9vHN/ ZXEuyVdd04ElKPreIU7aiCAQo5IojHgV5m2r8hfA8iQ2p6kcYX02YOEpGIhl5xgFvw4+ n8akxJogKyjWdzhXAt5qrsO8Nr6MImT4XeoGsKsZGcAPI9wipouxAGSnFSeox4gWdwWH fInMPcwFG549zPMZweEo8rPtkl2ofQn8maDXgVBTwHRV/g38SJFBdvRFeXvMBuXPwmaH X9pPAb94Q1bf67Rz0jy/6hdkub/wU5FaTZ3Tsj/PJKTZhhWcSdqMOi/UvMzut8/YU6Xs ipLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@lynne.ee header.s=s1 header.b=f69Zp5KM; 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=lynne.ee Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq4si2436452ejc.126.2021.11.24.11.19.23; Wed, 24 Nov 2021 11:19:24 -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=@lynne.ee header.s=s1 header.b=f69Zp5KM; 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=lynne.ee Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAB6068A7B8; Wed, 24 Nov 2021 21:19:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from w4.tutanota.de (w4.tutanota.de [81.3.6.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 713156881B1 for ; Wed, 24 Nov 2021 21:19:12 +0200 (EET) Received: from w3.tutanota.de (unknown [192.168.1.164]) by w4.tutanota.de (Postfix) with ESMTP id 1DB2D10602CC for ; Wed, 24 Nov 2021 19:19:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1637781551; s=s1; d=lynne.ee; h=From:From:To:To:Subject:Subject:Content-Description:Content-ID:Content-Type:Content-Type:Content-Transfer-Encoding:Cc:Date:Date:In-Reply-To:MIME-Version:MIME-Version:Message-ID:Message-ID:Reply-To:References:Sender; bh=aEderLZ2PJT9AoAcylVAYfuoV1UPtKWJbSV45kkkBbI=; b=f69Zp5KMpA6EoTDpkcaL9peGgfC565DDPCQQ7Ey933pzjcayEqMUPlov73gj/Mun d5rzY8dBJwsV3XVYXDFxpR5oHXzKJxVbwMIVFKDKp+KKfy9Cf9yfBIAr3elP0wcQoLC slvTMAuxLEf3BIwES7gk98OibW8+R3dD5SAIhZzllF2ZNJj8OUqYa8b/PiGHoqztzx7 FLEXrznJ+HZrjvr+HFfSIRQyT9gStBiOaoJ+I8CH2IeQqVF9396ImXJlgew+Yk+JDNW TBBf74L890Fik6Rkv5UX+8dctRgUCExBsUsXWC63Vew5F4VB+ixWiJBhsyy90aT7aSi FsrfC/sjoQ== Date: Wed, 24 Nov 2021 20:19:11 +0100 (CET) From: Lynne To: Ffmpeg Devel Message-ID: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: do not include -lvulkan in vulkan's pkg-config check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OHPinFOAYMqz Also fixes the non-pkg-config check. Patch attached. Subject: [PATCH] configure: do not include -lvulkan in vulkan's pkg-config check Also fixes the non-pkg-config check. --- configure | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d068b11073..e6cee21142 100755 --- a/configure +++ b/configure @@ -1464,13 +1464,13 @@ test_pkg_config_cpp(){ cond="$4" shift 4 disable $name - test_cmd $pkg_config --exists --print-errors $pkg_version || return + test_cmd $pkg_config --exists --print-errors $pkg_version || returnddd pkg_cflags=$($pkg_config --cflags $pkg_config_flags $pkg) - pkg_incdir=$($pkg_config --variable=includedir $pkg_config_flags $pkg) + pkg_incflags=$($pkg_config --cflags-onyl-I $pkg_config_flags $pkg) test_cpp_condition "$pkg_incdir/$headers" "$cond" "$@" && enable $name && set_sanitized "${name}_cflags" $pkg_cflags && - set_sanitized "${name}_incdir" $pkg_incdir + set_sanitized "${name}_incflags" $pkg_incflags } check_pkg_config(){ @@ -1487,6 +1487,13 @@ check_pkg_config_cpp(){ eval add_cflags \$${name}_cflags } +check_pkg_config_header_only(){ + log check_pkg_config_cpp "$@" + name="$1" + test_pkg_config_cpp "$@" && + eval add_cflags \$${name}_incflags +} + test_exec(){ test_ld "cc" "$@" && { enabled cross_compile || $TMPE >> $logfile 2>&1; } } @@ -6842,7 +6849,7 @@ enabled vdpau && enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd if enabled vulkan; then - require_pkg_config_cpp vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" || + check_pkg_config_header_only vulkan "vulkan >= 1.2.189" "vulkan/vulkan.h" "defined VK_VERSION_1_2" || require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_2" fi