From patchwork Fri Dec 2 00:17:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1654 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp12612vsa; Thu, 1 Dec 2016 16:17:53 -0800 (PST) X-Received: by 10.28.161.67 with SMTP id k64mr351666wme.69.1480637873552; Thu, 01 Dec 2016 16:17:53 -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 l90si481148wmi.65.2016.12.01.16.17.52; Thu, 01 Dec 2016 16:17:53 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 42621689D81; Fri, 2 Dec 2016 02:17:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f180.google.com (mail-wj0-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92992689CBD for ; Fri, 2 Dec 2016 02:17:35 +0200 (EET) Received: by mail-wj0-f180.google.com with SMTP id qp4so218886542wjc.3 for ; Thu, 01 Dec 2016 16:17:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to; bh=yU/wPQfQQOGRsA5INkcPTYRjmEnikxsQdKQmrG5VujA=; b=HScsmhuijqKReRKF2tPNq+JiOY7t3w6VyMj1WmkW7Pts5SWeJgCimSkZrM8gAHUurC DSvUjW8RA01EOXqpp5v3DPMWG9Wa3vrKvhfofezeq7julxlBE9fBSbVs1P+mnzjObz1u 1NpTUEptKQ1HNdIPn1TIcpWBwBy46NAdPPGKzfZlKyGC3ps13fLUybXnjwIZ6z4hIAkf r12PoGeHvrUN0OBMmrPyDdm07Sch1dsxJB1fOiXv3+7w9MvhPGCie0LRz4q/QKsSJ04y vR1LLXmA0WE1ySc82zu8SLpY6NTPWuEtn+5Gd/Oo8xm/8sUIG76Gzovp8RWWhMSH8wSg 2dBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to; bh=yU/wPQfQQOGRsA5INkcPTYRjmEnikxsQdKQmrG5VujA=; b=Rg0kGtKUbiMQ2ow7Q/u6x2AJTyFu3h8DLfOlmeeUi3P/vPgAkT/eyrGUqGIBi0r1a7 3KPieVnTz8jqpUrmArF3EDxUDF78Mf+pVOBdkFqVS//b3oKbDY/ZPAMW+D/VQ/jDDrCR Eb6yG9UDBNa4WefTBdRYaQwztdj9qXGZEWvVYUzoUqGP7yC8FwQJLXOypfNByQMJvtw1 c/N4nU6Ki6mBpBI8O3jeLSlB/65fQHBCAEGkICjsV/jQJBin+dl/JeqUIy8I4nq7JBQo 1TlbVakI+2a2c6U9kI5kTwkl0PkeU8S7AU/oeGtuqOEFpNhJJc0YPzVvtp6QvkkmoVZF FXHg== X-Gm-Message-State: AKaTC03lei0eDaXXlNREJEDwWu/J1apbfHff7TCN0clxiVqGQUdYdA6DfU3RzXAk9iitzA== X-Received: by 10.194.10.165 with SMTP id j5mr35236877wjb.119.1480637863086; Thu, 01 Dec 2016 16:17:43 -0800 (PST) Received: from [192.168.2.21] (p5B0950FE.dip0.t-ipconnect.de. [91.9.80.254]) by smtp.googlemail.com with ESMTPSA id 197sm365553wmy.16.2016.12.01.16.17.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 16:17:42 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: ffmpeg-devel@ffmpeg.org References: <0509cabe-2a98-cec9-aa71-b4980d39e6b9@googlemail.com> <82837f8e-a5fc-0ed2-7048-42636d335429@googlemail.com> Message-ID: Date: Fri, 2 Dec 2016 01:17:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 2/3] configure: enable autodetected libraries after option parsing 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" On 02.12.2016 01:05, Hendrik Leppkes wrote: > On Fri, Dec 2, 2016 at 12:27 AM, Andreas Cadhalpun > wrote: >> On 01.12.2016 11:01, Hendrik Leppkes wrote: >>> If those are enabled after option parsing, doesn't this then prevent >>> me from turning them off? >> >> Good catch, they should only be enabled, if they haven't been disabled. >> Updated patch is attached. >> > > I'm not 100% sure, but maybe enable_weak might work? It should only > affect the value if its still entirely unset, which should be what we > want? I tested with --disable-vaapi and enable_weak indeed works. > Would look nicer then the manual loopery. I don't really mind either way, so attached is a patch with enable_weak. Best regards, Andreas From ab69118d3fe4dc2ee1c0011593ee635739b888a3 Mon Sep 17 00:00:00 2001 From: Andreas Cadhalpun Date: Wed, 30 Nov 2016 23:49:35 +0100 Subject: [PATCH 2/3] configure: enable autodetected libraries after option parsing And only enable them, if they haven't been disabled. This is needed for the following patch. Signed-off-by: Andreas Cadhalpun --- configure | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 2ce7555..7c425e8 100755 --- a/configure +++ b/configure @@ -3237,15 +3237,6 @@ enable valgrind_backtrace sws_max_filter_size_default=256 set_default sws_max_filter_size -# Enable platform codecs by default. -enable audiotoolbox - -# Enable hwaccels by default. -enable d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc -enable xlib - -enable cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder - # build settings SHFLAGS='-shared -Wl,-soname,$$(@F)' LIBPREF="lib" @@ -3491,6 +3482,15 @@ for e in $env; do eval "export $e" done +# Enable platform codecs by default. +enable_weak audiotoolbox + +# Enable hwaccels by default. +enable_weak d3d11va dxva2 vaapi vda vdpau videotoolbox_hwaccel xvmc +enable_weak xlib + +enable_weak cuda cuvid nvenc vda_framework videotoolbox videotoolbox_encoder + disabled logging && logfile=/dev/null # Disable all the library-specific components if the library itself -- 2.10.2