From patchwork Wed May 3 12:20:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18589 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 353A1C327C for ; Wed, 3 May 2023 12:20:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7EDF0633C8; Wed, 3 May 2023 14:20:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1683116444; bh=Nrc2VCaQEYgwL/KrjgCkD/2fXQlzDrF+D5L1CKEfJTs=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=mibNVtFjoZ0pUuv9/vEMotnqCQq3bA/jee3WrhqrOg6v+/lqxeiUH9c1p30m7o83V J4ni0QpYfs6GPCGCjhKvgPv0ffEwc/Ba0Xe9dDvZubrShWMAm9pZPMHT1wQKX2MUgl L2B9TnurMV27p+A3cMSfsWZsAWsvWSfC/K5Ou4cbdqSIFPkFecpvIt1zyGJpuoc/wy nmOtzrWQ/MUUm70P8eMuniRaTU7keCVpGpl6Pu9Q4oH5uYfmhuvTRecwMg214gJ8gt 6j7AMq9MGtin8q7Fe8iaN3qnTGfv5wzSlulHbvo8q4gCIFn4YAx1IQDA9zySiF7vso WCtIydBeAGX3w== Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 93874633BB for ; Wed, 3 May 2023 14:20:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="KGUMKjp2"; dkim-atps=neutral Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f20215fa70so33548065e9.0 for ; Wed, 03 May 2023 05:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1683116440; x=1685708440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IemsxOVQ9LeJZukTKv2xAB06N6yXJw0JMYPwJ07JdP4=; b=KGUMKjp2QZnAMjp4y4D78ybL7/VMdip7LnjMTfzKb98J9fKVkLbagT9xQ1oO8jHhOO zcsBIzBH361nlBUO56Pxc4dCN27f88DMGiEdJj+UnPQQVHaEKBOCFptXQ1ryrdXIg5lX j3t9R7Z695iP9ue1wXPzFCGVdxx8N+ChQ2U3JB9kvo/MSV4WmS7YrCbzygbmi7ua45LM tSPO7Jhf16cL60hfK1d2fAT4tZNmJ6UhV8vhzsWcnl2VQWBTQwnkKRwbMZ9EEvBKWHWx du4571nZYmXsjb3EMnp5Ro7CcSCLqkzfhkjK0V0xb3l+q3uqaQfl6Sfg0J1/Zzh6fNJA HJwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683116440; x=1685708440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IemsxOVQ9LeJZukTKv2xAB06N6yXJw0JMYPwJ07JdP4=; b=F1njNc9OxS1uqn+dtr/jIRLhoFsh47+Acz0OF6TbBnck5r0svuE7U6Pd2Z0jk9phgk sF6fWZxYCeK0ssYa66fjQ/HYGSfqGAUoJBfq+wv/5Cx73vV1EL2O3qwJ3Exlik3itV6j /crNRi919sZTdOr62MWLRmDzd18xKVD1ITYTw49dpdsYmfzeYSaKmyaETn+PLsAxkyK5 om+AXiIrSkYto8f9O4dllN8Q9VfZV/J5E9YFATUm90LTZ8EPrxiIlJ1uiHDL+Y7c7ivV SuaEKK/JklbcZ45yH65DLIAJgNHXk2zGjkbyJGVTwHaVk/eQua0m11lDasf4WRAVc/jM qBsA== X-Gm-Message-State: AC+VfDz7Q8ao9LxlLefPCV8y6LvTcIGCot4bdP+p6ZZzukkSGBPPGoal NOnof+7gjqHOwY6DqJPnUkRhEvR1F9V4mfpoDJf7jQ== X-Google-Smtp-Source: ACHHUZ4hVnNE97++h7PCLFqmVAd0eAY2o7jsVbyI8M5O0SiWrM4+a+gXpjDZ499L1dTMSB+lkMVXOg== X-Received: by 2002:a1c:7311:0:b0:3f1:72db:4554 with SMTP id d17-20020a1c7311000000b003f172db4554mr14585532wmb.1.1683116439774; Wed, 03 May 2023 05:20:39 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id f23-20020a7bcd17000000b003ee443bf0c7sm1736785wmj.16.2023.05.03.05.20.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 May 2023 05:20:39 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 3 May 2023 13:20:26 +0100 Message-Id: <20230503122035.32026-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503122035.32026-1-naush@raspberrypi.com> References: <20230503122035.32026-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested pipeline handler directory structures 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: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The current pipeline handler build files require a flat directory struture for each pipeline handler. Modify the build files to remove this restriction and allow a directory structure such as: src/libcamera/pipeline/ |- raspberrypi |- common |- vc4 |- rkisp1 |- ipu3 where each subdir (e.g. raspberrypi/common, raspberrypi/vc4) has its own meson.build file. Such a directory structure will be introduced for the Raspberry Pi pipeline handler in a future commit. Signed-off-by: Naushir Patuck Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/libcamera/pipeline/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build index f14869f3a3c0..059c68bb964f 100644 --- a/src/libcamera/pipeline/meson.build +++ b/src/libcamera/pipeline/meson.build @@ -3,6 +3,15 @@ # Location of pipeline specific configuration files pipeline_data_dir = libcamera_datadir / 'pipeline' +# Allow multi-level directory structuring for the pipeline handlers if needed. +subdirs = [] + foreach pipeline : pipelines + pipeline = pipeline.split('/')[0] + if pipeline in subdirs + continue + endif + subdir(pipeline) + subdirs += [pipeline] endforeach