[libcamera-devel] [PATCH 04/13] pipeline: meson: Allow nested pipeline handler directory structures

[Laurent Pinchart]

Hi Naush,

Thank you for the patch.

On Thu, May 04, 2023 at 08:56:14AM +0100, Naushir Patuck via libcamera-devel wrote:
> On Wed, 3 May 2023 at 13:20, Naushir Patuck wrote:
> >
> > 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 <naush at raspberrypi.com>
> > ---
> >  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]
> 
> Like the pipeline handler case, this should be:
> 
>     subdirs += pipeline

I'll fix this when applying.

Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

> >  endforeach

-- 
Regards,

Laurent Pinchart