From patchwork Wed Sep 6 09:58:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 5004 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp384962jao; Wed, 6 Sep 2017 02:58:48 -0700 (PDT) X-Google-Smtp-Source: ADKCNb48s2QkqB5MW9TBIQu6ddaBSpMuJWXj4qk7kEtwhYuWaleTEzABsfk2JBjj2c9XizLR2srL X-Received: by 10.223.133.218 with SMTP id 26mr1440336wru.26.1504691928295; Wed, 06 Sep 2017 02:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504691928; cv=none; d=google.com; s=arc-20160816; b=j9Wy8Pg3Wcn34dabEbmUhjapoKZahc6ZIinOeiovN8Svv1ua9QUV0b1E+CnzeEGsX/ ya7wD0xIPXMu4I5blfIo99Ls52cRRYltVjeogrW4KP/99Tdnin+hG3j7lJM2NJNmmbpi rcEYrBdMe21xiHqhpvfsAp0CDCnI91WLrt+DG/bYWq6WLoupsj+iZikEV0cx5+6PNKj8 blJz5aBueeo2y21o9ciO9mhd7tcRtTARFmONmt1yC558v8EAFz78Pzpk6JYb6yXIcQy3 1GiSCFdqmlJCY8aijjVaohmxlAju5sjiOd6UDI3IcZ724RTQtRFOHfvP9662bZvTfhqT cc5A== 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:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=zsm6swrsdcsEUGVfXcIC96wLtsJF2WFSGLEXanq3mb8=; b=RIiIoPnv7eQdxMVyo11BlSUp/9ZNaFXsupBOLsOzTT+Mwgt52N7A+y08rJnjiEbZ3U +uv33bxkyhCRlTzAlk8P0YCGgufEy+1bKsmsRNrh/9OCwp35qjGtLxEb08In6xuVmyLN 7OUNP0g72R5Btvm9/Js2j4y5s6pVRxbEwMw5XamRpgCxxHKVkhJXN+225jax48SVW3gM frn57WcKEYC5Vm1F2hvMaq+yZKTl3etVM3ZbNvN39kEpKUF9EUupaszLgzOjjRa3IqYU R/9hp4MfsFiefLYToMsVZ6Oiyc9RJHF4fsNGAyKjJueeT1mcSNy98VX3WepTltbi9QUK z/JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=STyvtODK; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g74si941632wmi.79.2017.09.06.02.58.47; Wed, 06 Sep 2017 02:58:48 -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=@pkh.me header.s=selector1 header.b=STyvtODK; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A566C689E6E; Wed, 6 Sep 2017 12:58:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 522FB689CD6 for ; Wed, 6 Sep 2017 12:58:16 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 6e6a626e; Wed, 6 Sep 2017 09:58:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=ccHblN3 /sZiBlvzM9q00M6pk6Dk=; b=STyvtODKWMbxkqvazaxh4ZGJvWaC0GHc4lnggIP shO9VSojhnYdRXD1Ub7EcEm5L7gRVHaJ/g0ztytwR/4AaO4BluDmk5ZXtZTBZ+aO gXfVlUpwpLTfkrz7wkgCaCbDZL1U+FRK9FBBOLI6K+ix+C+9YFLr2OCMZmdCNxVu 4Zm3Vwe3zjyp6soytWoQUBaYwTpw+xuW7+z7TbD+VcmjjjSeEfRBKwIwxSMeJvE/ yVF5sMJJwrGqQZeoqxlib2bhWNoNeDhm225V6HZ3SV0mFVH/suUlboi+6y78DCOL +enmLREItHJayrHufenFAzf08yTv0mfL3v/SkEGrTmmhklQ== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=f /1q/mMdHrwCjMW4APrekVXsojUWDZuKsF0ncqPWBu2tz4WwAxGSI6q4IeqeSgsNz aX11FYhvaq/Zv8RzeiLpxSFTBmqdfYB846O+h3R7xpDkJAp0jxDfKBy5sdHmyI6a 0UlPtwqY5IThk96CApGvxZ1YXegZMaEhHry/qZZ789p983YDfNUIXO3VazRRLSga W59zLZFgnOqpENmWxQEuenfx8HNH1ZQ26HP8Xu5kl8E3Jcpb0rCyilqkGmSqxAMH T5nivq+eMY0a+4A9rtSfsTWASWWnsYilnnnuHSwRSPM6gWYePNnnqa5Qbs0bc0er FE4vpTJFf3V7+kbe/fcQg== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 55977eb5; Wed, 6 Sep 2017 09:58:08 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2017 11:58:03 +0200 Message-Id: <20170906095806.3070-4-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170906095806.3070-1-u@pkh.me> References: <20170906095806.3070-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/7] build: add --disable-avfoundation autodetect switch 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 Cc: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch --- configure | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 158f9ba24b..a4c2d81dee 100755 --- a/configure +++ b/configure @@ -202,6 +202,7 @@ External library support: themselves, not all their features will necessarily be usable by FFmpeg. --disable-alsa disable ALSA support [autodetect] + --disable-avfoundation disable Apple AVFoundation framework [autodetect] --enable-avisynth enable reading of AviSynth script files [no] --disable-bzlib disable bzlib [autodetect] --enable-chromaprint enable audio fingerprinting with chromaprint [no] @@ -1498,6 +1499,7 @@ EXAMPLE_LIST=" EXTERNAL_AUTODETECT_LIBRARY_LIST=" alsa + avfoundation bzlib iconv jack @@ -3023,8 +3025,8 @@ xwma_demuxer_select="riffdec" # indevs / outdevs alsa_indev_deps="alsa" alsa_outdev_deps="alsa" -avfoundation_indev_deps="pthreads" -avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia" +avfoundation_indev_deps="avfoundation pthreads" +avfoundation_indev_extralibs="-framework Foundation -framework CoreVideo -framework CoreMedia" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" caca_outdev_deps="libcaca" decklink_indev_deps="decklink threads" @@ -5755,6 +5757,13 @@ check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi check_lib coreservices "CoreServices/CoreServices.h" UTGetOSTypeFromString "-framework CoreServices" +enabled avfoundation && check_apple_framework AVFoundation + +enabled avfoundation && { + check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" || + check_lib avfoundation ApplicationServices/ApplicationServices.h CGGetActiveDisplayList "-framework ApplicationServices"; } + + check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss check_type "windows.h dxva.h" "DXVA_PicParams_HEVC" -DWINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP -D_CRT_BUILD_DESKTOP_APP=0 @@ -5839,9 +5848,6 @@ for func in $COMPLEX_FUNCS; do done # these are off by default, so fail if requested and not available -enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } -enabled avfoundation_indev && { check_lib avfoundation_indev CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || - check_lib avfoundation_indev ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; }