[libcamera-devel] [PATCH] libcamera: meson: Allow PH to change libcamera_deps

[Jacopo Mondi]

Hi Laurent

On Thu, Jun 08, 2023 at 05:48:01PM +0300, Laurent Pinchart wrote:
> Hi Jacopo,
>
> Thank you for the patch.
>
> On Thu, Jun 08, 2023 at 03:33:25PM +0200, Jacopo Mondi via libcamera-devel wrote:
> > From: Naushir Patuck <naush at raspberrypi.com>
> >
> > Pipeline handlers can have custom dependencies.
> >
> > Allow each pipeline handler subdir to add them to libcamera_deps[].
>
> I wonder how meson will handle the case where multiple pipeline handlers
> will add the same dependency. Is this something you've tested ?
>

It doesn't seem to bother meson at all

--- a/src/libcamera/pipeline/rkisp1/meson.build
+++ b/src/libcamera/pipeline/rkisp1/meson.build
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0

+libcamera_deps += [ libatomic ]
 libcamera_sources += files([
     'rkisp1.cpp',
     'rkisp1_path.cpp',
diff --git a/src/libcamera/pipeline/rpi/meson.build b/src/libcamera/pipeline/rpi/meson.build
index 2391b6a9729e..b3febd9a90ad 100644
--- a/src/libcamera/pipeline/rpi/meson.build
+++ b/src/libcamera/pipeline/rpi/meson.build
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: CC0-1.0

+libcamera_deps += [ libatomic ]
+
 subdir('common')


    Enabled pipelines        : rpi/vc4
                               rkisp1

Compiles fine

> > Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
> > Signed-off-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>
> > ---
> >  src/libcamera/meson.build | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> > index d438504198fe..3cd424779395 100644
> > --- a/src/libcamera/meson.build
> > +++ b/src/libcamera/meson.build
> > @@ -58,6 +58,8 @@ includes = [
> >      libcamera_includes,
> >  ]
> >
> > +libcamera_deps = []
> > +
> >  libatomic = cc.find_library('atomic', required : false)
> >  libthreads = dependency('threads')
> >
> > @@ -154,7 +156,7 @@ if ipa_sign_module
> >      libcamera_sources += ipa_pub_key_cpp
> >  endif
> >
> > -libcamera_deps = [
> > +libcamera_deps += [
> >      libatomic,
> >      libcamera_base,
> >      libcamera_base_private,
>
> --
> Regards,
>
> Laurent Pinchart