From patchwork Tue Jul 26 13:20:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 16791 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8C437C3275 for ; Tue, 26 Jul 2022 13:21:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C8BE563312; Tue, 26 Jul 2022 15:21:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658841676; bh=nghVSCmStzo+SVcJc3FL205lUIBPTzWdWNiS26OwrME=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=icmqCmRJyV3RITXhKpEiaErWj/N6Xq0ICE6pTFxx+Jm7hd6/guqFc/KvepCFuAKk6 /UlYBy4DdOjiAAnDTP8RYRZQ09MmIQDqp3fzDoPSaH9HyKvx23EjsV1JpTGg95Uo+B Yedq7cyyLVIa+tWu+WcSuaTArwCFsvdwu6vPyTw/iXxM1CUzpEpmR4eicKUtsxcckH tRlvLk7FN7mNMvK160xXrd/ZdVx3P2Lfc1cVaadLMQbaCa6kXiI3bj6V0TGvzApmIp 46uDNAIbinLLYaPDgfSNOWUQkuThK74uLBX9Ff2kyhAP6GsoIm4ZVWXNiWZ3ZfLuy6 XMf5fImcChfBw== Received: from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::222]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC46660487 for ; Tue, 26 Jul 2022 15:21:14 +0200 (CEST) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id A2BA740003; Tue, 26 Jul 2022 13:21:13 +0000 (UTC) To: Date: Tue, 26 Jul 2022 15:20:51 +0200 Message-Id: <20220726132051.228019-1-foss+libcamera@0leil.net> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] correctly report enabled ipa modules X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Quentin Schulz via libcamera-devel From: Quentin Schulz Reply-To: Quentin Schulz Cc: libcamera-devel@lists.libcamera.org, Quentin Schulz Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Quentin Schulz "ipa_modules" stores the value of the ipas meson build option. IPAs are enabled if and only if there is an enabled pipeline for an IPA listed in "ipa_modules" array. It is basically the intersection of pipelines and ipa_modules array. In order to correctly report which IPAs get enabled, let's create a new array storing this intersection. Cc: Quentin Schulz Reported-by: Daniel Semkowicz Signed-off-by: Quentin Schulz Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- meson.build | 2 +- src/ipa/meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 3f7a3f56..e8b81ad8 100644 --- a/meson.build +++ b/meson.build @@ -173,7 +173,7 @@ py_mod.find_installation('python3', modules: py_modules) ## Summarise Configurations summary({ 'Enabled pipelines': pipelines, - 'Enabled IPA modules': ipa_modules, + 'Enabled IPA modules': enabled_ipa_modules, 'Tracing support': tracing_enabled, 'Android support': android_enabled, 'GStreamer support': gst_enabled, diff --git a/src/ipa/meson.build b/src/ipa/meson.build index e15a8a06..849bb372 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -27,6 +27,7 @@ ipa_sign = files('ipa-sign.sh') ipa_names = [] ipa_modules = get_option('ipas') +enabled_ipa_modules = [] # The ipa-sign-install.sh script which uses the ipa_names variable will itself # prepend MESON_INSTALL_DESTDIR_PREFIX to each ipa module name, therefore we @@ -35,6 +36,7 @@ foreach pipeline : pipelines if ipa_modules.contains(pipeline) subdir(pipeline) ipa_names += ipa_install_dir / ipa_name + '.so' + enabled_ipa_modules += pipeline endif endforeach