From patchwork Wed Sep 6 09:58:04 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: 5010 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp385318jao; Wed, 6 Sep 2017 02:59:08 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4pGZWf5i9vpa144qQbTsIGhy2nU17G9xT2tDyc0wIbwG11/l2lHHco4OIaLI95ReHPVenm X-Received: by 10.223.198.134 with SMTP id j6mr1128340wrg.277.1504691948173; Wed, 06 Sep 2017 02:59:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504691948; cv=none; d=google.com; s=arc-20160816; b=ZBzsYa11PLbbhOHvlt0U7Yk0hU4I4ZTgARGdbl8pK79rnzRIoofi4NhTftPjBr+dpu Ba8s98783cYJCk6CTtedRKnqEhzaDaJ5ffo20WP0P38B6i0gRfHOW47YqWJgOvG9TTPP MVViEMt5BbEKsFnDjGoFRWGDxRnpcGn7JJcnF4hez/d+n0yR8uYTx4GWKhSBRId2zwVu JZyiFtE1qWC6hjJyEhmsxV9KFKbiW3JnWKvQ3fJsyR8taZ5kcrnTqBJ0D0fF6v5bMLd2 BDwgYrEpdbZC8zfJ/ni3dCzhvzOCMGII1fxm5aY5l7XIS2v23esfTvphqW1Fy9npRzgH pB8A== 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=tE64zc4qKgfic6bIx/78FypIMlWzDTWcmZZa1w73e70=; b=0UNjsRJGqK942+BW4+kMNATvKfyh+PuIl2vqCqq4cJlzyz1EjoNgnPTBIwWo6MWkJ6 R9PTwj+q9/2/O6skEDVKew1GW038uLfVvrrhwuOZqLDwQou6Deka3rAeNXZQrRxojNGE TGhaNBOvHGLbXEp0LnD8WtqAOmycG439c+8PmFjHT5NRBSLvvIR/Nn5zGF+6TF2a9LQk g/wBE9FyjF+hG5y86LjZca8B3/FFhWF4ut4BfYGtDPrlS1Gy+MDg3Ny4zv5FvVLO14eQ dHLA75vSz0k81Zydr2+NVMn7eh66GrpKXU1MceLtznIWlwG1qRQvddVpv5DHS1IyEUnA sSMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=O/4Hi2RI; 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 n30si1904803wra.549.2017.09.06.02.59.07; Wed, 06 Sep 2017 02:59:08 -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=O/4Hi2RI; 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 591A368A39F; Wed, 6 Sep 2017 12:58:23 +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 51BEC689B3D for ; Wed, 6 Sep 2017 12:58:17 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id 3317cfcc; Wed, 6 Sep 2017 09:58:10 +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=lBm2UXY DhY8TlGSKEG/mYrv2+dI=; b=O/4Hi2RIYJt7wgnfk5iDGCc3Zjyp8sXJjxsOWug 2RKe0kiDBnq20BZl24A7arXyUKORiMDV3rtdwfYOLwYH3mrP7PYqEDgOMNlBBf1z wbRx40Q4QNpfuaxHdJw+AQ74rA9ZeAuUvVihP2/U2AdarmNamIyuwQvyTHqf710Q IEEWplvcuQKhV9quYXQPWxdAWyINzUBOu9m3YMu1cQzv0cwRuD/+TCogV+ynAqgk Fs0NjBxbIPpnYNUH5JEznHFCNCONDRj1NDSKbDe+FnbAEM01bg3S9SlIbfiWQBCs UQH5YRx1NKw8KZMpwusVMdHo04gCD1E+UgW6IiQ0Ja6iO+Q== 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=D +AVH8iwkxPHhxOxA/PLZXtt6YXQR3rqaYt/VzhCBjAMWukuoXTWSoiCdPlE3wmFE aRRWC5WFRvremIlBunDef3fIr60VUiEbqJADV0Ts6M5tSoIwZj1kw9ZNunLQyXZs LzwZFQ96jA9pNq5QM8qTh/sUz8blnYOPoWC33+waPk8kJnBsozcY5V6oScBwRGyu fQdm668Y3agP4tpskgAk51C1RWyZqeS8Xzv9dTevNZBbdfbAyy9bTMEVJ6XuPH+4 hAVIC5F9o5c5GQRR1hOCkWgV0NY+sUtHZIqbi/E5KaD83JCJkDlv9bjT+96t3yon BbzmyM/30c4jGAzG1GjXA== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id 060bc63e; 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:04 +0200 Message-Id: <20170906095806.3070-5-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 5/7] build: add --disable-coreimage 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index a4c2d81dee..1e36cde447 100755 --- a/configure +++ b/configure @@ -205,6 +205,7 @@ External library support: --disable-avfoundation disable Apple AVFoundation framework [autodetect] --enable-avisynth enable reading of AviSynth script files [no] --disable-bzlib disable bzlib [autodetect] + --disable-coreimage disable Apple CoreImage framework [autodetect] --enable-chromaprint enable audio fingerprinting with chromaprint [no] --enable-frei0r enable frei0r video filtering [no] --enable-gcrypt enable gcrypt, needed for rtmp(t)e support @@ -1501,6 +1502,7 @@ EXTERNAL_AUTODETECT_LIBRARY_LIST=" alsa avfoundation bzlib + coreimage iconv jack libxcb @@ -3134,6 +3136,10 @@ blackframe_filter_deps="gpl" boxblur_filter_deps="gpl" bs2b_filter_deps="libbs2b" colormatrix_filter_deps="gpl" +coreimage_filter_deps="coreimage" +coreimage_filter_extralibs="-framework OpenGL -framework AppKit" +coreimagesrc_filter_deps="coreimage" +coreimagesrc_filter_extralibs="-framework OpenGL -framework AppKit" cover_rect_filter_deps="avcodec avformat gpl" cropdetect_filter_deps="gpl" deinterlace_qsv_filter_deps="libmfx" @@ -5599,8 +5605,6 @@ frei0r_filter_extralibs='$ldl' frei0r_src_filter_extralibs='$ldl' ladspa_filter_extralibs='$ldl' nvenc_extralibs='$ldl' -coreimage_filter_extralibs="-framework CoreImage -framework AppKit -framework OpenGL" -coreimagesrc_filter_extralibs="-framework CoreImage -framework AppKit -framework OpenGL" if ! disabled network; then check_func getaddrinfo $network_extralibs @@ -5758,6 +5762,7 @@ 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 coreimage && check_apple_framework CoreImage enabled avfoundation && { check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" || @@ -5852,8 +5857,6 @@ enabled cuda_sdk && require cuda_sdk cuda.h cuCtxCreate -lcuda enabled cuvid && { enabled cuda || die "ERROR: CUVID requires CUDA"; } enabled chromaprint && require chromaprint chromaprint.h chromaprint_get_version -lchromaprint -enabled coreimage_filter && { check_header_objcc CoreImage/CoreImage.h || disable coreimage_filter; } -enabled coreimagesrc_filter && { check_header_objcc CoreImage/CoreImage.h || disable coreimagesrc_filter; } enabled decklink && { { check_header DeckLinkAPI.h || die "ERROR: DeckLinkAPI.h header not found"; } && { check_cpp_condition DeckLinkAPIVersion.h "BLACKMAGIC_DECKLINK_API_VERSION >= 0x0a060100" || die "ERROR: Decklink API version must be >= 10.6.1."; } } enabled libndi_newtek && { check_header Processing.NDI.Lib.h || die "ERROR: Processing.NDI.Lib.h header not found"; }