[{"id":27042,"web_url":"https://patchwork.libcamera.org/comment/27042/","msgid":"","date":"2023-05-04T07:56:14","subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"content":"Hi all,\n\nOn Wed, 3 May 2023 at 13:20, Naushir Patuck wrote:\n>\n> The current pipeline handler build files require a flat directory\n> struture for each pipeline handler. Modify the build files to remove\n> this restriction and allow a directory structure such as:\n>\n> src/libcamera/pipeline/\n> |- raspberrypi\n> |- common\n> |- vc4\n> |- rkisp1\n> |- ipu3\n>\n> where each subdir (e.g. raspberrypi/common, raspberrypi/vc4) has its own\n> meson.build file. Such a directory structure will be introduced for the\n> Raspberry Pi pipeline handler in a future commit.\n>\n> Signed-off-by: Naushir Patuck \n> ---\n> src/libcamera/pipeline/meson.build | 9 +++++++++\n> 1 file changed, 9 insertions(+)\n>\n> diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\n> index f14869f3a3c0..059c68bb964f 100644\n> --- a/src/libcamera/pipeline/meson.build\n> +++ b/src/libcamera/pipeline/meson.build\n> @@ -3,6 +3,15 @@\n> # Location of pipeline specific configuration files\n> pipeline_data_dir = libcamera_datadir / 'pipeline'\n>\n> +# Allow multi-level directory structuring for the pipeline handlers if needed.\n> +subdirs = []\n> +\n> foreach pipeline : pipelines\n> + pipeline = pipeline.split('/')[0]\n> + if pipeline in subdirs\n> + continue\n> + endif\n> +\n> subdir(pipeline)\n> + subdirs += [pipeline]\n\nLike the pipeline handler case, this should be:\n\n subdirs += pipeline\n\nRegards,\nNaush\n\n> endforeach\n> --\n> 2.34.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5C0AEC0DA4\n\tfor ;\n\tThu, 4 May 2023 07:56:33 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1C2A9633A8;\n\tThu, 4 May 2023 09:56:33 +0200 (CEST)","from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com\n\t[IPv6:2607:f8b0:4864:20::1131])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DBE62627DE\n\tfor ;\n\tThu, 4 May 2023 09:56:30 +0200 (CEST)","by mail-yw1-x1131.google.com with SMTP id\n\t00721157ae682-55a6efe95c9so1117097b3.1\n\tfor ;\n\tThu, 04 May 2023 00:56:30 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683186993;\n\tbh=MxGU2MdYqvjFLWrryV2BRmW5hX7kQzyNuJImpn50LWk=;\n\th=References:In-Reply-To:Date:To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=fhuS6nRvxm4fH125F5/5iUMI8kyqxMa8nQ4Yc80/8zAjBAoDMuEodZ/LeH+ueP4VC\n\t60alSE0cYbv7TT8im9W/dBFn6tdjr+MeAe8qjXJoJrVciQqqaiOpahT5djQHS6hIzj\n\tDot/PjgbgKEJhRcQTYDhWEmjEhahzce7lwKLZj4cPs9/mdMUEi4KZQBw55mRzf40xq\n\tvd6V4omQ8nWUnXMRgzDSjjgseDLp6vQ3csyRKuMnphPfbtucnYxdxrmYD11kGPadCm\n\t8o4EVveouO/t8V6nBzf/1uULzlGvNX/oRTlGeExcuBpwT8OjCuYLkfYXa0noWCYdOh\n\tIgnCb1nz6q2vQ==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1683186989; x=1685778989;\n\th=to:subject:message-id:date:from:in-reply-to:references:mime-version\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=1LV7xNwi5EbBHPIQJmOh2IsuUfP+Ujo9wfzqluXEPWU=;\n\tb=oVrgi1dXYdioNSZt0QMRohyyN/XMLoN7fY1Y5G+VdPSODTF6JDtbRKlv/3jgrLt3Hs\n\tw2UPiedn7tiE2x1bOFpvDP/MhOOb3IMBDPgfEvLdX9ccHUSVR5wZTBYKqjkMSNLtiAWh\n\tXn0BdHy0Jx3e9n9dhgnzYPmZd70bz5DFSZ6K85iJBgG7/UMtbpUVYjZ5iMYMq0nkKqI2\n\ts/6Y3e8TQc6gAwxKHkEoiTECB/TqUbNiSJ3kGbtlTAjHVkrRuePALfG0psfqXBsO1B13\n\tuna5ig6Mmc4XQm9pzlURM/tYgKsZgW79l4N+3+7wHQp8kTNhzF5K9hnMqThmgzhMJ0j4\n\tOBJw=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"oVrgi1dX\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1683186989; x=1685778989;\n\th=to:subject:message-id:date:from:in-reply-to:references:mime-version\n\t:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n\tbh=1LV7xNwi5EbBHPIQJmOh2IsuUfP+Ujo9wfzqluXEPWU=;\n\tb=kPHXXkdEN9NXK63DzrSmXgkbafTihTnLXSt8RRcBOL2knaguuc1wn79VJN5AEpvSzP\n\thfcSSrUEFE6AOijYCEJSxUT8M+V59/N0R6sBx6M0z6uHGCWyddIAcJLQ8IBqRn0mmBT+\n\tCIffmVowHfipyYwewUWe/8CYwxHd+aWNnfA1Y9QDwl/hfueHaTZUNSZ+27zK2doJJo5p\n\tk450rmaygQnNmvYaSfqOVK/PqWfvgsrZp+yU1eWeKQAsWHLFdKTU11aOJfJa2NABieKP\n\tRF4Uo8jW4UMuw+DUj/vquwNZoQlKqx2S6Gzm9BzDZp+9WtDSKFt3G1jIXZn9gz9MpLv4\n\tK5dQ==","X-Gm-Message-State":"AC+VfDzVqh895fYmxdYyU3pTVH+jlSgDiGIPz9oSjFPhYgePTbmqE7BN\n\tejhp5VFlxi/7+xtRn1MYhn5PqDzBtufJ+vhq8mE4WOQ6kgKH/gRW1DanDA==","X-Google-Smtp-Source":"ACHHUZ5uYwBLA1Ewt+lnjeVD3T4ut11ECUOB6AEAtIYkppdICJnoMcDf2MSbr8qI38tuqZUQ5wgIIjMXmvkvURxYvqA=","X-Received":"by 2002:a81:4e42:0:b0:55a:a90c:ecb8 with SMTP id\n\tc63-20020a814e42000000b0055aa90cecb8mr1456058ywb.15.1683186989702;\n\tThu, 04 May 2023 00:56:29 -0700 (PDT)","MIME-Version":"1.0","References":"<20230503122035.32026-1-naush@raspberrypi.com>\n\t<20230503122035.32026-5-naush@raspberrypi.com>","In-Reply-To":"<20230503122035.32026-5-naush@raspberrypi.com>","Date":"Thu, 4 May 2023 08:56:14 +0100","Message-ID":"","To":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"UTF-8\"","Subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":27046,"web_url":"https://patchwork.libcamera.org/comment/27046/","msgid":"","date":"2023-05-04T09:55:11","subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Naush\n\nOn Wed, May 03, 2023 at 01:20:26PM +0100, Naushir Patuck via libcamera-devel wrote:\n> The current pipeline handler build files require a flat directory\n> struture for each pipeline handler. Modify the build files to remove\n> this restriction and allow a directory structure such as:\n>\n> src/libcamera/pipeline/\n> |- raspberrypi\n> |- common\n> |- vc4\n> |- rkisp1\n> |- ipu3\n>\n> where each subdir (e.g. raspberrypi/common, raspberrypi/vc4) has its own\n> meson.build file. Such a directory structure will be introduced for the\n> Raspberry Pi pipeline handler in a future commit.\n>\n> Signed-off-by: Naushir Patuck \n\nWith your comment fixed\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/libcamera/pipeline/meson.build | 9 +++++++++\n> 1 file changed, 9 insertions(+)\n>\n> diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\n> index f14869f3a3c0..059c68bb964f 100644\n> --- a/src/libcamera/pipeline/meson.build\n> +++ b/src/libcamera/pipeline/meson.build\n> @@ -3,6 +3,15 @@\n> # Location of pipeline specific configuration files\n> pipeline_data_dir = libcamera_datadir / 'pipeline'\n>\n> +# Allow multi-level directory structuring for the pipeline handlers if needed.\n> +subdirs = []\n> +\n> foreach pipeline : pipelines\n> + pipeline = pipeline.split('/')[0]\n> + if pipeline in subdirs\n> + continue\n> + endif\n> +\n> subdir(pipeline)\n> + subdirs += [pipeline]\n> endforeach\n> --\n> 2.34.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 032FEBD16B\n\tfor ;\n\tThu, 4 May 2023 09:55:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BCDF1633A8;\n\tThu, 4 May 2023 11:55:15 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4104F627DE\n\tfor ;\n\tThu, 4 May 2023 11:55:14 +0200 (CEST)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 05AA16E0;\n\tThu, 4 May 2023 11:55:10 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683194115;\n\tbh=Ov6v3w7ZQd02MuFesADVkt+Rz6mKlf6NsvlM9MMlgOQ=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=nNG9GaOcVTAL0CH8xNfYSR8npsQ5vlMz9MfSmk9oiVzrgc4Yv1iF2TZOwcLAQEi68\n\tJEKvP5oAdYNJbt0286xrFUYiEx7aKLXKKFPgoSW1/NWtOaMxACi3XprXGBxZ69rIVF\n\tg4qN5uvyi43W46nAExEUV0PloaGUdxnvITLXd4haw15YxEZFy5IqzbHN6vz0AGkVK5\n\tMgCplt3PjR1j6frGkAD3AcrznGN4CYwhL4jmAiyHQCMEZv9zCw5r/mUY5XFE/6k5fk\n\tGQf65oAtzFbTCZTLHs6gTHnlQ5DHTwjITbY9lc3UYnAFDGbMiwhHKnLwcyHtdzGDC7\n\tG6DxaoqlASx8Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1683194111;\n\tbh=Ov6v3w7ZQd02MuFesADVkt+Rz6mKlf6NsvlM9MMlgOQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=MCoXeE35EZb2xK5m6wHmx00tgz2Olenfqc4+cEHe0l32BmSdbV+HRYMPKy/ooxtAd\n\tGwnQpVVU0gg/S9g1Aw5BnImq6MaDzttZTLUWx+i7ECkHG4AnfFvhmzRhYGBhDhvyPH\n\tXUemh4jcSaaRF5xxJbwbGj1ROa9ohg3x3a9oueMY="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"MCoXeE35\"; dkim-atps=neutral","Date":"Thu, 4 May 2023 11:55:11 +0200","To":"Naushir Patuck ","Message-ID":"","References":"<20230503122035.32026-1-naush@raspberrypi.com>\n\t<20230503122035.32026-5-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230503122035.32026-5-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":27048,"web_url":"https://patchwork.libcamera.org/comment/27048/","msgid":"<20230504111150.GH4551@pendragon.ideasonboard.com>","date":"2023-05-04T11:11:50","subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Thu, May 04, 2023 at 08:56:14AM +0100, Naushir Patuck via libcamera-devel wrote:\n> On Wed, 3 May 2023 at 13:20, Naushir Patuck wrote:\n> >\n> > The current pipeline handler build files require a flat directory\n> > struture for each pipeline handler. Modify the build files to remove\n> > this restriction and allow a directory structure such as:\n> >\n> > src/libcamera/pipeline/\n> > |- raspberrypi\n> > |- common\n> > |- vc4\n> > |- rkisp1\n> > |- ipu3\n> >\n> > where each subdir (e.g. raspberrypi/common, raspberrypi/vc4) has its own\n> > meson.build file. Such a directory structure will be introduced for the\n> > Raspberry Pi pipeline handler in a future commit.\n> >\n> > Signed-off-by: Naushir Patuck \n> > ---\n> > src/libcamera/pipeline/meson.build | 9 +++++++++\n> > 1 file changed, 9 insertions(+)\n> >\n> > diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\n> > index f14869f3a3c0..059c68bb964f 100644\n> > --- a/src/libcamera/pipeline/meson.build\n> > +++ b/src/libcamera/pipeline/meson.build\n> > @@ -3,6 +3,15 @@\n> > # Location of pipeline specific configuration files\n> > pipeline_data_dir = libcamera_datadir / 'pipeline'\n> >\n> > +# Allow multi-level directory structuring for the pipeline handlers if needed.\n> > +subdirs = []\n> > +\n> > foreach pipeline : pipelines\n> > + pipeline = pipeline.split('/')[0]\n> > + if pipeline in subdirs\n> > + continue\n> > + endif\n> > +\n> > subdir(pipeline)\n> > + subdirs += [pipeline]\n> \n> Like the pipeline handler case, this should be:\n> \n> subdirs += pipeline\n\nI'll fix this when applying.\n\nReviewed-by: Laurent Pinchart \n\n> > endforeach","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 3A57FBD16B\n\tfor ;\n\tThu, 4 May 2023 11:11:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 911B2633B4;\n\tThu, 4 May 2023 13:11:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ADE1461EAE\n\tfor ;\n\tThu, 4 May 2023 13:11:39 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(133-32-181-51.west.xps.vectant.ne.jp [133.32.181.51])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A4A8C7CE;\n\tThu, 4 May 2023 13:11:35 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683198700;\n\tbh=psIOn7IKI8qLsATqyzuiH1NjHnrD9IfAGxuwoQC2IA4=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=vmp7LTvC1w25pNOy7JRKu8NIdPjRe0Se05BeveGhTMHq0yh1eZGyqfhwKLawYsObb\n\t+zyFx8abGRNGk5CUJT3uJdsnZH4YXw9/MlrSQD2PpN6gbitY/ThXu/OBa2576/UFBf\n\thwGAhXDkV71TuZp7uG1uxzHZMsDPmv0zRd5MEFewjf6jnc4oCM2o1BoOSdXs1Lo/Wi\n\t3vNqnajwtRfh8Nv1VBcbRBfTQs8OuzgxINmrMTIiXFi841ioVrwQ+NrMpw3gSe1XoU\n\tAQ7SVY+yjJlMZXz5FyGMFxgCzG+YLs9sBDkQNrfVns/0qonztjE9WhWACtkg2v7Gux\n\t4SM3gG8QW726Q==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1683198696;\n\tbh=psIOn7IKI8qLsATqyzuiH1NjHnrD9IfAGxuwoQC2IA4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=onTWKTgktU7d9CufD3GN2D8vzgDqegKEItMn6X5PKbHZcZJaW63wZU8cDqM9jTEgz\n\tQdwHTZa0IQUC5Y8HKX+AJJWSlCTPzNalQqZzBX2ao6ZYP2uqjDaIKECtG1+zh5yYQX\n\tQE2ZlW+KAgfO/kVOIMVoBK+klTQ5zRxXJs7AP0w0="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"onTWKTgk\"; dkim-atps=neutral","Date":"Thu, 4 May 2023 14:11:50 +0300","To":"Naushir Patuck ","Message-ID":"<20230504111150.GH4551@pendragon.ideasonboard.com>","References":"<20230503122035.32026-1-naush@raspberrypi.com>\n\t<20230503122035.32026-5-naush@raspberrypi.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested\n\tpipeline handler directory structures","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]