From patchwork Tue Dec 17 15:15:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 22379 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 64A36C32F6 for ; Tue, 17 Dec 2024 15:15:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 9EC6D67FD6; Tue, 17 Dec 2024 16:15:24 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=protonmail.com header.i=@protonmail.com header.b="nLMjSXvk"; dkim-atps=neutral Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1BF2467F0D for ; Tue, 17 Dec 2024 16:15:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1734448522; x=1734707722; bh=I2pH3oiSCkESrFWIUpjaLHI6FoXi6cM70EYGqmicIfI=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector: List-Unsubscribe:List-Unsubscribe-Post; b=nLMjSXvkyVTbH31IKHDT1GUpfO/f24KbUMgF7JumU3A9d8CO53KT/BH1qYeyA4GbN oTJCwf/+uTCDuRhcg+HXX/IbwaT+EEbpvhfRVHA/KW3SzZv64u6rBlVExWiBVM3FGN 8xRdFTR8eFY2jzfnDUKpCR3OBPWJ7Sto/DeFDOZFzYjg7hEJe8PYsbmH9xNvu+VtR/ 3Rg5jHsZqFg+ia77SjeUqv5J1Q18NIzTJPpmB2Kq2kVIBtcVPmAqB009ZHZppC6uYk qovHRA2QyhjL8NdHstXDQd7w6RVSQEhJSCYnn/Jz2vwKun0xRbparGUuseLMNkalGZ SUUXHuW2F+16w== Date: Tue, 17 Dec 2024 15:15:16 +0000 To: libcamera-devel@lists.libcamera.org From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= Subject: [PATCH v1] meson: Don't override pipeline list when `auto` is selected Message-ID: <20241217151513.133599-1-pobrn@protonmail.com> Feedback-ID: 20568564:user:proton X-Pm-Message-ID: 11a699e9e213a302c3922fef3c65c81dbc29d894 MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Consider `pipelines=auto,virtual`. Previously that would select everything that `auto` would, but not actually enable the `virtual` pipeline handler because the `pipelines` list was reset. Bug: https://bugs.libcamera.org/show_bug.cgi?id=247 Signed-off-by: Barnabás Pőcze Reviewed-by: Laurent Pinchart Acked-by: Kieran Bingham --- meson.build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 33afbb741..5e5e4756d 100644 --- a/meson.build +++ b/meson.build @@ -204,7 +204,7 @@ liblttng = dependency('lttng-ust', required : get_option('tracing')) # Pipeline handlers # -pipelines = get_option('pipelines') +wanted_pipelines = get_option('pipelines') arch_arm = ['arm', 'aarch64'] arch_x86 = ['x86', 'x86_64'] @@ -220,16 +220,18 @@ pipelines_support = { 'virtual': ['test'], } -if pipelines.contains('all') +if wanted_pipelines.contains('all') pipelines = pipelines_support.keys() -elif pipelines.contains('auto') +elif wanted_pipelines.contains('auto') host_cpu = host_machine.cpu_family() pipelines = [] foreach pipeline, archs : pipelines_support - if host_cpu in archs or 'any' in archs + if pipeline in wanted_pipelines or host_cpu in archs or 'any' in archs pipelines += pipeline endif endforeach +else + pipelines = wanted_pipelines endif # Tests require the vimc pipeline handler, include it automatically when tests