[libcamera-devel,01/11] ipa: vimc: Remove isolated VIMC IPA module

Message ID 20200404015624.30440-2-laurent.pinchart@ideasonboard.com
State Superseded
Headers show
Series
  • Sign IPA modules instead of checking their advertised license
Related show

Commit Message

Laurent Pinchart April 4, 2020, 1:56 a.m. UTC
The isolated VIMC module isn't used in any test. Remove it to prepare
for the rework of IPA module isolation. The feature can be added back
later alongside corresponding tests if needed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/ipa/vimc/meson.build | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

Comments

Niklas Söderlund April 7, 2020, 12:46 p.m. UTC | #1
Hi Laurent,

Thanks for your work.

On 2020-04-04 04:56:14 +0300, Laurent Pinchart wrote:
> The isolated VIMC module isn't used in any test. Remove it to prepare
> for the rework of IPA module isolation. The feature can be added back
> later alongside corresponding tests if needed.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  src/ipa/vimc/meson.build | 23 ++++++++---------------
>  1 file changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build
> index 435c7d3160be..e827e75f9f91 100644
> --- a/src/ipa/vimc/meson.build
> +++ b/src/ipa/vimc/meson.build
> @@ -1,15 +1,8 @@
> -ipa_vimc_sources = [
> -    ['ipa_vimc',         'LGPL-2.1-or-later'],
> -    ['ipa_vimc_isolate', 'Proprietary'],
> -]
> -
> -foreach t : ipa_vimc_sources
> -    ipa = shared_module(t[0], 'vimc.cpp',
> -                        name_prefix : '',
> -                        include_directories : [ipa_includes, libipa_includes],
> -                        dependencies : libcamera_dep,
> -                        link_with : libipa,
> -                        install : true,
> -                        install_dir : ipa_install_dir,
> -                        cpp_args : '-DLICENSE="' + t[1] + '"')
> -endforeach
> +ipa = shared_module('ipa_vimc', 'vimc.cpp',
> +                    name_prefix : '',
> +                    include_directories : [ipa_includes, libipa_includes],
> +                    dependencies : libcamera_dep,
> +                    link_with : libipa,
> +                    install : true,
> +                    install_dir : ipa_install_dir,
> +                    cpp_args : '-DLICENSE="LGPL-2.1-or-later"')
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build
index 435c7d3160be..e827e75f9f91 100644
--- a/src/ipa/vimc/meson.build
+++ b/src/ipa/vimc/meson.build
@@ -1,15 +1,8 @@ 
-ipa_vimc_sources = [
-    ['ipa_vimc',         'LGPL-2.1-or-later'],
-    ['ipa_vimc_isolate', 'Proprietary'],
-]
-
-foreach t : ipa_vimc_sources
-    ipa = shared_module(t[0], 'vimc.cpp',
-                        name_prefix : '',
-                        include_directories : [ipa_includes, libipa_includes],
-                        dependencies : libcamera_dep,
-                        link_with : libipa,
-                        install : true,
-                        install_dir : ipa_install_dir,
-                        cpp_args : '-DLICENSE="' + t[1] + '"')
-endforeach
+ipa = shared_module('ipa_vimc', 'vimc.cpp',
+                    name_prefix : '',
+                    include_directories : [ipa_includes, libipa_includes],
+                    dependencies : libcamera_dep,
+                    link_with : libipa,
+                    install : true,
+                    install_dir : ipa_install_dir,
+                    cpp_args : '-DLICENSE="LGPL-2.1-or-later"')