[libcamera-devel,v5,06/10] libcamera: ipa: meson: Allow access to internal libcamera headers

2144 diff mbox series

Allow IPA implementations to use internal libcamera headers so they can
utilize helpers not exposed to applications.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Hi Niklas,
    please note this will conflict with:
"[PATCH v4 3/5] ipa: meson: Give IPAs access to internal libcamera APIs"

in my ipa-test series.

On Tue, Oct 08, 2019 at 02:45:30AM +0200, Niklas Söderlund wrote:
> Allow IPA implementations to use internal libcamera headers so they can
> utilize helpers not exposed to applications.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  src/ipa/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/ipa/meson.build b/src/ipa/meson.build
> index f09915bc13887bd3..10448c2ffc76af4b 100644
> --- a/src/ipa/meson.build
> +++ b/src/ipa/meson.build
> @@ -8,7 +8,7 @@ ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')
>  foreach t : ipa_dummy_sources
>      ipa = shared_module(t[0], 'ipa_dummy.cpp',
>                          name_prefix : '',
> -                        include_directories : libcamera_includes,
> +                        include_directories : includes,

I did something slightly different here, as 'includes' will also
include 'include/android/' when compiling with android support. I'm
not sure this should be exposed to the IPAs.

let me know which one you think it's best, I'll take either yours in
or keep mine.

The mentioned patchs also instructs to link IPAs against libcamera:

---
 src/ipa/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/ipa/meson.build b/src/ipa/meson.build
index b5bcd7b2c3db..ac16e1da6126 100644
--- a/src/ipa/meson.build
+++ b/src/ipa/meson.build
@@ -5,10 +5,16 @@ ipa_vimc_sources = [

 ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')

+ipa_includes = [
+    libcamera_includes,
+    libcamera_internal_includes,
+]
+
 foreach t : ipa_vimc_sources
     ipa = shared_module(t[0], 'ipa_vimc.cpp',
                         name_prefix : '',
-                        include_directories : libcamera_includes,
+                        include_directories : ipa_includes,
+                        dependencies : libcamera_dep,
                         install : true,
                         install_dir : ipa_install_dir,
                         cpp_args : '-DLICENSE="' + t[1] + '"')
--
2.23.0


>                          install : true,
>                          install_dir : ipa_install_dir,
>                          cpp_args : '-DLICENSE="' + t[1] + '"')
> --
> 2.23.0
>
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel