From patchwork Fri Sep 14 16:29:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10327 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp828796jap; Fri, 14 Sep 2018 09:29:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZPNdVowv1F+C7JVUbf+6AvOOM50ElyvmFhqNgBY4o6ucEf+rEiqXcG4MOLhOflF6jdjS/K X-Received: by 2002:a1c:dd05:: with SMTP id u5-v6mr3123591wmg.107.1536942596604; Fri, 14 Sep 2018 09:29:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536942596; cv=none; d=google.com; s=arc-20160816; b=GE9a8NbyrcrrnddnuekfeDIY5R8hFcsxCRPD2JK34zwVwkSRPvdxcDndld+VpHPFNB 0FKAP7QA0yuwhOxuBifVoJHbgaI5knYKPNmptQob5ZDflD4uwsClntJP58v56qw7KFOk wgkB2s6a3MmSfntDLxtKgzznUl+7FLXseoKdOb2qFCcA6qJDT+dNAbieCvuTymOvFyNu wiLQIiT26klEprZwOGWa87iw/Smxbi6/KEcfZX6U9HSYmpekxcjT+pdu2FMUpdYN/zVu 53BgMYsicuM9a0SzXglT0hUwXnK3DoZv1j+FYmqUzJK+XBeTbipp85gq6v869ONJcX8H h9NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=lDlkdSx5Hbzc/Yhb6cv4N1F9s3bFkccVQJJHnm1g4Mo=; b=fVxjUstnS8RiImBsGWObIHWDpPFCo1MxrSNbK0VK6RSxkuDKZA5VFL8mAz7i35CtNc Dj/8Wje9SW4s4mgdsysK7t1qFqSJPS8P/QZs5evu/BbUReLFBwVsh6M53PHA82m/8QPb Yi4b3rsRC22fmQGiQ2rcAgGp2bHZPoxnbZMfy/MsX9/Al4Exci7+GxT5wXZv9qhw1Il2 /wjdSCFUafOAGjcuKv95YO++h+v7YonfWoXCy2bqRx11IFoUupdN0CJCkvJjgUcj5z3p TbGBeAKsmGWS6IUwy8nESG1YF/EX/m4kYNGCqNkRZn+9BmSqiNg9FLqza6wMq3EfCfrL RH8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=CZe8EgGM; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q206-v6si1991119wme.88.2018.09.14.09.29.55; Fri, 14 Sep 2018 09:29:56 -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=@gmail.com header.s=20161025 header.b=CZe8EgGM; 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=QUARANTINE 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 E1BDD68A669; Fri, 14 Sep 2018 19:29:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFFFE68A5A6 for ; Fri, 14 Sep 2018 19:29:35 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id z78-v6so5501000qka.0 for ; Fri, 14 Sep 2018 09:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=E+ujUH6DUzTdDAnafL7HfJinwd3KGuw3jH4MvKYwXf0=; b=CZe8EgGM8RoAJeZEnECLV4HzTXQu5regFam4X83THW5UIJaxc6nvBrlkri/y27FKHM pa+aapruedz7cAfeXyWMsjQpTBeMSqaVQFoU71SJ/ZSPgtkxqYLPjBbnH/xR0mZydvOM XWgC8++YwcHTzNcPDjyCQoKyjWOv0X5gN1V+LzBks0Y+TL4rx14Y5wChcT+cJtUMeQRH 48eRd9VPb1AE6fBFM00O3+x1lQfnVbJRJ8AXjPuX/ftjU6Xlvaljf42q9MYMl4otkBZm 7KGNSYRWbDlbbu66CXCv6xThZQ6dmnbWbmJYtegDj0s4vsory4ihqiMlfvpYrFxuDZz1 EtIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=E+ujUH6DUzTdDAnafL7HfJinwd3KGuw3jH4MvKYwXf0=; b=cr/sQy8KnppMPi+DLT68wwaiB0TW5paVMD8sWIOCyJG8p72+ncVpJvZ5OpBc5ltdX5 fjBLj85I4o01JoZKW2jRvlNUo6YcX7ewrJ8A5ulWeyVFbosen8yeTZ/ri3yiO7eI+Yhm 26JxHAVAFfbajk3GCJUlJ+GEKsi+n7elIriQKVTrHcKJPQcy5T2GVFIqt5xQpa/Q2xUD SUoiE5mU/wzMctOc6y6WzPVh2Li7mzhy64kw6Ip3zyOWlM7WqxoXtJhfkPwSJm+dRk15 cPjuKDEoDVWA53H/5FBXwxOTyB7d30S3oaHRJpdREjMoaHtfNgqaEG9MsBFIBIJ/4lrn Crfw== X-Gm-Message-State: APzg51DT9R8KiWGIDz6PUo0Qou3Tsw32d1igrV8kEruE0gXdPEq2wk1m FBInceZ9e3sQzGabCTYa7WzzPgHT X-Received: by 2002:a37:d708:: with SMTP id m8-v6mr8681135qki.132.1536942585966; Fri, 14 Sep 2018 09:29:45 -0700 (PDT) Received: from localhost.localdomain ([181.231.186.237]) by smtp.gmail.com with ESMTPSA id a26-v6sm5689018qtc.74.2018.09.14.09.29.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Sep 2018 09:29:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Sep 2018 13:29:22 -0300 Message-Id: <20180914162922.4560-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] configure: split the libaom check into decoder and encoder 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" libaom can be built with either of the two modules alone, and a generic check for aom_codec_version would blindly enable both wrappers. Check directly for the modules instead, and print a more descriptive error when one is requested but not available. Signed-off-by: James Almer --- configure | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 14aa311ffd..80225d475b 100755 --- a/configure +++ b/configure @@ -6047,7 +6047,16 @@ enabled gmp && require gmp gmp.h mpz_export -lgmp enabled gnutls && require_pkg_config gnutls gnutls gnutls/gnutls.h gnutls_global_init enabled jni && { [ $target_os = "android" ] && check_headers jni.h && enabled pthreads || die "ERROR: jni not found"; } enabled ladspa && require_headers ladspa.h -enabled libaom && require_pkg_config libaom "aom >= 1.0.0" aom/aom_codec.h aom_codec_version +enabled libaom && { + enabled libaom_av1_decoder && { + check_pkg_config libaom_av1_decoder "aom >= 1.0.0" "aom/aom_decoder.h aom/aomdx.h" aom_codec_av1_dx || + die "ERROR: libaom decoder version >= 1.0.0 not found"; + } + enabled libaom_av1_encoder && { + check_pkg_config libaom_av1_encoder "aom >= 1.0.0" "aom/aom_encoder.h aom/aomcx.h" aom_codec_av1_cx || + die "ERROR: libaom encoder version >= 1.0.0 not found"; + } +} enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 enabled libass && require_pkg_config libass libass ass/ass.h ass_library_init