From patchwork Wed Jan 11 23:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 18100 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 9ED8AC3240 for ; Wed, 11 Jan 2023 23:22:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B6FD7625DE; Thu, 12 Jan 2023 00:22:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1673479355; bh=3me9dXsJ9OeaXuKt3E7E0UY69qrLoHK1CyqYZF46w4Q=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=fFdHSp6pYTe5mYObO/NNAxi7bJbSI6Jp/hila/zvViuzCMqTQXyy/pF8c2ql0seMb rX4BPI6RCMr456b4H0sfvmWeX8ug56nzzTi2WQbRButdSrfhrd79JVy3MvlFikQb4d dy4RCKsaUb5MsjD3dpNqIeb3IX1xyRihGhR96yCcFlaIYRI7ChU0VGGGUkNeoBePrd Y9ZpSj1UMQC4wD7T7Mgf+xXcbWPT4CoeF9cMRwFAtNo5iiq9TqmrdrIy7B8cVZRB3h +uOtHoSZf0WN33NEOz8Eicd5oiVGIf1RD2HF9wtyWqH2scUecFAFh17Khkc28xN36c gSj0yGK4DIpPA== Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id AC72A61F07 for ; Thu, 12 Jan 2023 00:22:33 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="RvDo4e3L"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673479352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/0bYrOmMoo2KXDT3V2foTyD+xgqmrJPiMnVA/Z20zG8=; b=RvDo4e3L4O84qd7Eyxesi5Z1YU3dfGfjb42vJ1w8tMe8akTiAi6xmwcLvCh+UpmsBTDS+d MOe8Pu6izLcY1RyYvC6s1g/+VrxJwT1QzzBIBNBhgdCg7SvjoT9NIpaMz6nhq8wElhk1NY FzGZkXK2z62+Qqb2pFXBLIPAYhpUjPM= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-227-qHrSWbhnN0CjUHlcP2e65A-1; Wed, 11 Jan 2023 18:22:31 -0500 X-MC-Unique: qHrSWbhnN0CjUHlcP2e65A-1 Received: by mail-wr1-f70.google.com with SMTP id n13-20020adfc60d000000b0029bdfcf52eeso3073879wrg.8 for ; Wed, 11 Jan 2023 15:22:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/0bYrOmMoo2KXDT3V2foTyD+xgqmrJPiMnVA/Z20zG8=; b=5XfZ9IU8Tt9kYgF6U9aYzC0HPH4/cggQKCz7kMIxpw2LO/85Ks8365mQKooFcr3Cph D8p0ifhFKPXLlB5GJ9WnSQQoGFjk0KHCWSkxnryfZSSaqF1lVpfLUlzKi1y9nnvOz8ns prUa9VUHNRKUqnJHRDljFYKynaPy6ebJkfJk/TLSKYIWR8rVm3wsXK81nfPgSmsrg011 51jKYJGyzCnoCr1oeFLCAP6XyQLKJ7Ux82Ui9neLURPCduf3ySBlRk/8Q6LGx9b+6ykf lu4vctALF52uvtllbY4IpEBHgbXGsfTspLlSp5qJ5Q6zPXIwUqFrwdNupcvUtHXObja4 6buA== X-Gm-Message-State: AFqh2kow4eMLP5251vfMXCILn69U+r58QhCMDBJkMB7lwUoBxCnqscKR ITsCURDtrCkTf3cWsyTSN6x+LpE7c/HMwPDI8igd7OwGRXokpe41SXnfD6el4NJ6eZljs9VzO99 OPSTgHnTTKIwKqMnnm8TTxVfNTmA3cajPt+dJg6iqJ/R7aKyCBvlY47lzKsSuCwH7RpDBgEx0ai v7BaBLAeyB X-Received: by 2002:a5d:620e:0:b0:242:7307:ae04 with SMTP id y14-20020a5d620e000000b002427307ae04mr41614883wru.57.1673479350176; Wed, 11 Jan 2023 15:22:30 -0800 (PST) X-Google-Smtp-Source: AMrXdXvhvGoj9CVapBpO8wK8arig+ooHxJhOB2SFCb9KYWUtxVu0CIaik8wuwp0xcz7xRtZnifrLHg== X-Received: by 2002:a5d:620e:0:b0:242:7307:ae04 with SMTP id y14-20020a5d620e000000b002427307ae04mr41614873wru.57.1673479349862; Wed, 11 Jan 2023 15:22:29 -0800 (PST) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id u5-20020adfdb85000000b002ba2646fd30sm17511459wri.36.2023.01.11.15.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 15:22:29 -0800 (PST) To: libcamera-devel@lists.libcamera.org Date: Thu, 12 Jan 2023 00:22:21 +0100 Message-Id: <20230111232221.265057-1-javierm@redhat.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [libcamera-devel] [PATCH] meson: Remove pipelines list duplication 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: Javier Martinez Canillas via libcamera-devel From: Javier Martinez Canillas Reply-To: Javier Martinez Canillas Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The supported pipelines are listed in three places: the meson_options.txt file, the defined array when a user selects -Dpipelines="all", and arrays defined when the default -Dpipelines="auto" is selected. This is hard to maintain and error prone, let's at least in the meson file have a single place where these pipelines lists are defined. Signed-off-by: Javier Martinez Canillas --- meson.build | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 389c547206fb..f9e3280ec0f2 100644 --- a/meson.build +++ b/meson.build @@ -168,38 +168,41 @@ liblttng = dependency('lttng-ust', required : get_option('tracing')) # are enabled. pipelines = get_option('pipelines') +pipelines_aarch64 = ['imx8-isi', 'rkisp1'] +pipelines_arm = ['raspberrypi', 'simple'] +pipelines_agnostic = ['uvcvideo'] +pipelines_test = ['vimc'] +pipelines_x86 = ['ipu3'] + if pipelines.contains('all') - pipelines = [ - 'imx8-isi', - 'ipu3', - 'raspberrypi', - 'rkisp1', - 'simple', - 'uvcvideo', - 'vimc', - ] + pipelines = [] + pipelines += pipelines_aarch64 + pipelines += pipelines_arm + pipelines += pipelines_agnostic + pipelines += pipelines_test + pipelines += pipelines_x86 endif if pipelines.contains('auto') host_cpu = host_machine.cpu_family() pipelines = [] if host_cpu == 'x86' or host_cpu == 'x86_64' - pipelines += ['ipu3'] + pipelines += pipelines_x86 elif host_cpu == 'aarch64' - pipelines += ['imx8-isi', 'rkisp1'] + pipelines += pipelines_aarch64 endif if host_cpu == 'arm' or host_cpu == 'aarch64' - pipelines += ['raspberrypi', 'simple'] + pipelines += pipeines_arm endif # Always include the uvcvideo pipeline handler. - pipelines += ['uvcvideo'] + pipelines += pipelines_agnostic endif if get_option('test') and 'vimc' not in pipelines message('Enabling vimc pipeline handler to support tests') - pipelines += ['vimc'] + pipelines += pipelines_test endif # Utilities are parsed first to provide support for other components.