[libcamera-devel,v2,11/11] libcamera: Add a check for the yaml module

Message ID 20200924071922.231063-12-ricardo@ribalda.com
State Superseded
Headers show
Series
  • Fix README.rst
Related show

Commit Message

Ricardo Ribalda Sept. 24, 2020, 7:19 a.m. UTC
Yaml is not installed by default, so it needs to be checked during
configuration for its presence.

Credit-to: Ezequiel Garcia <ezequiel@collabora.com>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
---
 src/libcamera/meson.build | 1 +
 1 file changed, 1 insertion(+)

Comments

Laurent Pinchart Sept. 24, 2020, 2:08 p.m. UTC | #1
Hi Ricardo,

Thank you for the patch.

On Thu, Sep 24, 2020 at 09:19:22AM +0200, Ricardo Ribalda wrote:
> Yaml is not installed by default, so it needs to be checked during
> configuration for its presence.
> 
> Credit-to: Ezequiel Garcia <ezequiel@collabora.com>
> Cc: Ezequiel Garcia <ezequiel@collabora.com>
> Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>

If you don't mind, I'll apply
https://lists.libcamera.org/pipermail/libcamera-devel/2019-November/005517.html
instead.

> ---
>  src/libcamera/meson.build | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index 0e6ecf5..575bea1 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -77,6 +77,7 @@ if libudev.found()
>      ])
>  endif
>  
> +import('python').find_installation('python3', modules : ['yaml'])
>  gen_controls = files('gen-controls.py')
>  
>  control_sources = []
Ricardo Ribalda Sept. 24, 2020, 2:39 p.m. UTC | #2
HI

On Thu, Sep 24, 2020 at 4:09 PM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
>
> Hi Ricardo,
>
> Thank you for the patch.
>
> On Thu, Sep 24, 2020 at 09:19:22AM +0200, Ricardo Ribalda wrote:
> > Yaml is not installed by default, so it needs to be checked during
> > configuration for its presence.
> >
> > Credit-to: Ezequiel Garcia <ezequiel@collabora.com>
> > Cc: Ezequiel Garcia <ezequiel@collabora.com>
> > Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com>
>
> If you don't mind, I'll apply
> https://lists.libcamera.org/pipermail/libcamera-devel/2019-November/005517.html
> instead.

Sure!, no worries

>
> > ---
> >  src/libcamera/meson.build | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> > index 0e6ecf5..575bea1 100644
> > --- a/src/libcamera/meson.build
> > +++ b/src/libcamera/meson.build
> > @@ -77,6 +77,7 @@ if libudev.found()
> >      ])
> >  endif
> >
> > +import('python').find_installation('python3', modules : ['yaml'])
> >  gen_controls = files('gen-controls.py')
> >
> >  control_sources = []
>
> --
> Regards,
>
> Laurent Pinchart

Patch

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 0e6ecf5..575bea1 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -77,6 +77,7 @@  if libudev.found()
     ])
 endif
 
+import('python').find_installation('python3', modules : ['yaml'])
 gen_controls = files('gen-controls.py')
 
 control_sources = []