[libcamera-devel,v3,6/6] Additions in meson.build files
diff mbox series

Message ID 20220814160747.52093-6-kunalagarwal1072002@gmail.com
State New
Headers show
Series
  • [libcamera-devel,v3,1/6] pipeline: simple: shader: Shaders for debayering
Related show

Commit Message

Kunal Agarwal Aug. 14, 2022, 4:07 p.m. UTC
Adds files and dependencies required for GL Converter
to compile

Signed-off-by: Kunal Agarwal <kunalagarwal1072002@gmail.com>
---
 src/libcamera/meson.build                 | 3 +++
 src/libcamera/pipeline/simple/meson.build | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

Comments

Kieran Bingham Aug. 14, 2022, 5:14 p.m. UTC | #1
Quoting Kunal Agarwal via libcamera-devel (2022-08-14 17:07:47)
> Adds files and dependencies required for GL Converter
> to compile

These should be added by the patches that need them. Each patch should
be possible to compile fully by itself in the series.

--
Kieran


> 
> Signed-off-by: Kunal Agarwal <kunalagarwal1072002@gmail.com>
> ---
>  src/libcamera/meson.build                 | 3 +++
>  src/libcamera/pipeline/simple/meson.build | 8 +++++++-
>  2 files changed, 10 insertions(+), 1 deletion(-)
> 
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index b57bee7e..b14102f8 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -136,6 +136,9 @@ libcamera_deps = [
>      libcamera_base,
>      libcamera_base_private,
>      libdl,
> +    libegl,
> +    libgbm,
> +    libgl,
>      libgnutls,
>      liblttng,
>      libudev,
> diff --git a/src/libcamera/pipeline/simple/meson.build b/src/libcamera/pipeline/simple/meson.build
> index 9c99b32f..02929456 100644
> --- a/src/libcamera/pipeline/simple/meson.build
> +++ b/src/libcamera/pipeline/simple/meson.build
> @@ -1,6 +1,12 @@
>  # SPDX-License-Identifier: CC0-1.0
>  
>  libcamera_sources += files([
> -    'converter.cpp',
> +    'converter_gl.cpp',
> +    'shader.cpp',
>      'simple.cpp',
> +    'texture.cpp',
>  ])
> +
> +libegl = dependency('egl', required : true)
> +libgbm = dependency('gbm', required : true)
> +libgl = dependency('gl', required : true)
> -- 
> 2.25.1
>
Kunal Agarwal Aug. 14, 2022, 7:24 p.m. UTC | #2
Hi Kieran,

> Quoting Kunal Agarwal via libcamera-devel (2022-08-14 17:07:47)
> > Adds files and dependencies required for GL Converter
> > to compile
>
> These should be added by the patches that need them. Each patch should
> be possible to compile fully by itself in the series.

Yes this makes sense.. I'll do it for the next version. Thanks

Regards,
Kunal Agarwal


On Sun, Aug 14, 2022 at 10:44 PM Kieran Bingham
<kieran.bingham@ideasonboard.com> wrote:
>
> Quoting Kunal Agarwal via libcamera-devel (2022-08-14 17:07:47)
> > Adds files and dependencies required for GL Converter
> > to compile
>
> These should be added by the patches that need them. Each patch should
> be possible to compile fully by itself in the series.
>
> --
> Kieran
>
>
> >
> > Signed-off-by: Kunal Agarwal <kunalagarwal1072002@gmail.com>
> > ---
> >  src/libcamera/meson.build                 | 3 +++
> >  src/libcamera/pipeline/simple/meson.build | 8 +++++++-
> >  2 files changed, 10 insertions(+), 1 deletion(-)
> >
> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> > index b57bee7e..b14102f8 100644
> > --- a/src/libcamera/meson.build
> > +++ b/src/libcamera/meson.build
> > @@ -136,6 +136,9 @@ libcamera_deps = [
> >      libcamera_base,
> >      libcamera_base_private,
> >      libdl,
> > +    libegl,
> > +    libgbm,
> > +    libgl,
> >      libgnutls,
> >      liblttng,
> >      libudev,
> > diff --git a/src/libcamera/pipeline/simple/meson.build b/src/libcamera/pipeline/simple/meson.build
> > index 9c99b32f..02929456 100644
> > --- a/src/libcamera/pipeline/simple/meson.build
> > +++ b/src/libcamera/pipeline/simple/meson.build
> > @@ -1,6 +1,12 @@
> >  # SPDX-License-Identifier: CC0-1.0
> >
> >  libcamera_sources += files([
> > -    'converter.cpp',
> > +    'converter_gl.cpp',
> > +    'shader.cpp',
> >      'simple.cpp',
> > +    'texture.cpp',
> >  ])
> > +
> > +libegl = dependency('egl', required : true)
> > +libgbm = dependency('gbm', required : true)
> > +libgl = dependency('gl', required : true)
> > --
> > 2.25.1
> >

Patch
diff mbox series

diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index b57bee7e..b14102f8 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -136,6 +136,9 @@  libcamera_deps = [
     libcamera_base,
     libcamera_base_private,
     libdl,
+    libegl,
+    libgbm,
+    libgl,
     libgnutls,
     liblttng,
     libudev,
diff --git a/src/libcamera/pipeline/simple/meson.build b/src/libcamera/pipeline/simple/meson.build
index 9c99b32f..02929456 100644
--- a/src/libcamera/pipeline/simple/meson.build
+++ b/src/libcamera/pipeline/simple/meson.build
@@ -1,6 +1,12 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
 libcamera_sources += files([
-    'converter.cpp',
+    'converter_gl.cpp',
+    'shader.cpp',
     'simple.cpp',
+    'texture.cpp',
 ])
+
+libegl = dependency('egl', required : true)
+libgbm = dependency('gbm', required : true)
+libgl = dependency('gl', required : true)