diff options
| -rw-r--r-- | include/ipa/ipa_module_info.h | 1 | ||||
| -rw-r--r-- | src/ipa/rkisp1/rkisp1.cpp | 1 | ||||
| -rw-r--r-- | src/ipa/vimc/meson.build | 3 | ||||
| -rw-r--r-- | src/ipa/vimc/vimc.cpp | 1 | ||||
| -rw-r--r-- | src/libcamera/ipa_module.cpp | 21 | ||||
| -rw-r--r-- | test/ipa/ipa_module_test.cpp | 1 |
6 files changed, 1 insertions, 27 deletions
diff --git a/include/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h index 7ecd1495..3b1c37d2 100644 --- a/include/ipa/ipa_module_info.h +++ b/include/ipa/ipa_module_info.h @@ -18,7 +18,6 @@ struct IPAModuleInfo { uint32_t pipelineVersion; char pipelineName[256]; char name[256]; - char license[64]; } __attribute__((packed)); extern "C" { diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index af38e329..acbbe58c 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -275,7 +275,6 @@ const struct IPAModuleInfo ipaModuleInfo = { 1, "PipelineHandlerRkISP1", "RkISP1 IPA", - "LGPL-2.1-or-later", }; struct ipa_context *ipaCreate() diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build index 3097a12f..3c932aa7 100644 --- a/src/ipa/vimc/meson.build +++ b/src/ipa/vimc/meson.build @@ -7,8 +7,7 @@ mod = shared_module(ipa_name, dependencies : libcamera_dep, link_with : libipa, install : true, - install_dir : ipa_install_dir, - cpp_args : '-DLICENSE="LGPL-2.1-or-later"') + install_dir : ipa_install_dir) custom_target(ipa_name + '.so.sign', input : mod, diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 566a66e4..d2267e11 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -127,7 +127,6 @@ const struct IPAModuleInfo ipaModuleInfo = { 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", - LICENSE, }; struct ipa_context *ipaCreate() diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 96b44f13..958ede74 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -216,27 +216,6 @@ Span<uint8_t> elfLoadSymbol(Span<uint8_t> elf, const char *symbol) * \var IPAModuleInfo::name * \brief The name of the IPA module * - * \var IPAModuleInfo::license - * \brief License of the IPA module - * - * This license is used to determine whether to force isolation of the IPA in - * a separate process. If the license is "Proprietary", then the IPA will - * be isolated. If the license is open-source, then the IPA will be allowed to - * run without isolation if the user enables it. The license should be an - * SPDX license string. The following licenses are currently available to - * allow the IPA to run unisolated: - * - * - GPL-2.0-only - * - GPL-2.0-or-later - * - GPL-3.0-only - * - GPL-3.0-or-later - * - LGPL-2.1-only - * - LGPL-2.1-or-later - * - LGPL-3.0-only - * - LGPL-3.0-or-later - * - * Any other license will cause the IPA to be run isolated. - * * \todo Allow user to choose to isolate open source IPAs */ diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index 287e53fd..d22c302f 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -59,7 +59,6 @@ protected: 0, "PipelineHandlerVimc", "Dummy IPA for Vimc", - "GPL-2.0-or-later", }; count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo); |