From patchwork Sat Nov 12 00:44:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendrik Leppkes X-Patchwork-Id: 1392 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp43658vsb; Fri, 11 Nov 2016 16:45:11 -0800 (PST) X-Received: by 10.194.112.196 with SMTP id is4mr12853957wjb.92.1478911511064; Fri, 11 Nov 2016 16:45:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fq2si5460219wjb.119.2016.11.11.16.45.10; Fri, 11 Nov 2016 16:45:11 -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; 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 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 13406689F98; Sat, 12 Nov 2016 02:45:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8DAFB689F4F for ; Sat, 12 Nov 2016 02:45:02 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id u144so822208wmu.0 for ; Fri, 11 Nov 2016 16:45:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=HggQabCzAmuBTCBT2pTS6IB+ncJZimVE2J/5/o8Tj6Y=; b=gY/Ojon7KDcgqQ4eaRwpRMdEfLLcj8aET55nufmP0J/lXca7W1UJ+3/53aSh3HFq2O 6Fw/ygOhZVVZLoNtbz4qlpDCcCoPpCYfAigD2r3/VxuDDNWa+k5vRXbPZIiKjvdbJVFW fHyQtOJdw6hqzjUGCWs87sCHUgX13ILuwjdLs9sKGf0Q/vxVFNOZ2B+wpTH8X430Xjjh vea3Xraehng2vh/fFfgXN/psmqyCAWWSbuAfjRJHw4dz6T7Hw63GAmEQVvotrPZKAjnE cwvWj4I/W8SOrXxN7HSnAVftwCp0kU0RmGBlWakVPGYUkhjV5xo3cgB6CKSZTXfAMSFx ynQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=HggQabCzAmuBTCBT2pTS6IB+ncJZimVE2J/5/o8Tj6Y=; b=IChy10lqBpNQy94t04FY0TnD8svdjbKT7u6ZJ7m1uzeW0Vj9Z0gV5kGjrvUM0ortHR hJx0mCZ4gHvAroxpf+HFLAyoJxzdsyMr58ukMEtzyIHMP4nRaZof8P1VGALF3K68DmlH JD/OOjqipAlx1eh2D04+hrb40tSMpugUxuLt9Y7dloeuGz8FBuZomqylYz2DGhSshxLZ 5OLbNqv/79EeqtV69Q6esOzvTRT05WQgoAhTXAAKAUr6xQVKJQXLpB5IPJiIfATK4j12 mvHMsVw9Gv+/LBjbmqBh4FOdzDpAPd0L2cL8O0RQh2hkrRgvD8qm5JeqHbiHL88QonTK bsHg== X-Gm-Message-State: ABUngveI4y7zqR5A9t3IQmF+c0k11zgnEEFH/R+InWY8P4VAZ3TiNKXqr/4auOpTTrxWCQ== X-Received: by 10.28.109.156 with SMTP id b28mr543551wmi.116.1478911501864; Fri, 11 Nov 2016 16:45:01 -0800 (PST) Received: from localhost (p5DC19DBD.dip0.t-ipconnect.de. [93.193.157.189]) by smtp.gmail.com with ESMTPSA id yj10sm14016735wjb.3.2016.11.11.16.45.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Nov 2016 16:45:01 -0800 (PST) From: Hendrik Leppkes To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Nov 2016 01:44:58 +0100 Message-Id: <20161112004458.4156-1-h.leppkes@gmail.com> X-Mailer: git-send-email 2.10.1.windows.1 Subject: [FFmpeg-devel] [PATCH] configure: use check_lib2 for cuda and cuvid 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" Fixes building on Windows with MSVC using the link libraries distributed with the CUDA SDK. check_lib2 is required here because it includes the header to get the full signature of the function, including the stdcall calling convention and all of its arguments, which enabled the linker to determine the fully qualified object name and resolve it through the import library, since the CUDA SDK libraries do not include un-qualified aliases. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index be7e925..c00c591 100755 --- a/configure +++ b/configure @@ -5659,10 +5659,10 @@ fi enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || check_lib2 ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } -enabled cuda && { check_lib cuda.h cuInit -lcuda || +enabled cuda && { check_lib2 cuda.h cuInit -lcuda || die "ERROR: CUDA not found"; } enabled cuvid && { add_cflags -I$source_path; - check_lib "compat/cuda/cuviddec.h" cuvidCreateDecoder -lnvcuvid || + check_lib2 "compat/cuda/cuviddec.h" cuvidCreateDecoder -lnvcuvid || die "ERROR: CUVID not found"; } && { enabled cuda || die "ERROR: CUVID requires CUDA"; }