libcamera: Move IPA headers from include/ipa/ to include/libcamera/ipa/

The IPA headers are installed into $prefix/include/libcamera/ipa/, but
are located in the source tree in include/ipa/. This requires files
within libcamera to include them with

 #include <ipa/foo.h>

while a third party IPA would need to use

 #include <libcamera/ipa/foo.h>

Not only is this inconsistent, it can create issues later if IPA headers
need to include each other, as the first form of include directive
wouldn't be valid once the headers are installed.

Fix the problem by moving the IPA headers to include/libcamera/ipa/.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>

13 files changed, 7 insertions, 7 deletions

diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h
index a717d406..bd770e13 100644
--- a/include/libcamera/internal/ipa_context_wrapper.h
+++ b/include/libcamera/internal/ipa_context_wrapper.h
@@ -7,7 +7,7 @@
 #ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__
 #define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__
 
-#include <ipa/ipa_interface.h>
+#include <libcamera/ipa/ipa_interface.h>
 
 #include "libcamera/internal/control_serializer.h"
 
diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h
index f07d91fc..2412d757 100644
--- a/include/libcamera/internal/ipa_manager.h
+++ b/include/libcamera/internal/ipa_manager.h
@@ -10,8 +10,8 @@
 #include <stdint.h>
 #include <vector>
 
-#include <ipa/ipa_interface.h>
-#include <ipa/ipa_module_info.h>
+#include <libcamera/ipa/ipa_interface.h>
+#include <libcamera/ipa/ipa_module_info.h>
 
 #include "libcamera/internal/ipa_module.h"
 #include "libcamera/internal/pipeline_handler.h"
diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h
index 2f569db0..5b54cb31 100644
--- a/include/libcamera/internal/ipa_module.h
+++ b/include/libcamera/internal/ipa_module.h
@@ -11,8 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <ipa/ipa_interface.h>
-#include <ipa/ipa_module_info.h>
+#include <libcamera/ipa/ipa_interface.h>
+#include <libcamera/ipa/ipa_module_info.h>
 
 #include "libcamera/internal/log.h"
 #include "libcamera/internal/pipeline_handler.h"
diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h
index 1111065b..e9a36608 100644
--- a/include/libcamera/internal/ipa_proxy.h
+++ b/include/libcamera/internal/ipa_proxy.h
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include <ipa/ipa_interface.h>
+#include <libcamera/ipa/ipa_interface.h>
 
 namespace libcamera {
 
diff --git a/include/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h
index 6d3bf279..6d3bf279 100644
--- a/include/ipa/ipa_controls.h
+++ b/include/libcamera/ipa/ipa_controls.h
diff --git a/include/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h
index dc9fc714..dc9fc714 100644
--- a/include/ipa/ipa_interface.h
+++ b/include/libcamera/ipa/ipa_interface.h
diff --git a/include/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h
index 3b1c37d2..3b1c37d2 100644
--- a/include/ipa/ipa_module_info.h
+++ b/include/libcamera/ipa/ipa_module_info.h
diff --git a/include/ipa/ipa_vimc.h b/include/libcamera/ipa/ipa_vimc.h
index 8e82dd94..8e82dd94 100644
--- a/include/ipa/ipa_vimc.h
+++ b/include/libcamera/ipa/ipa_vimc.h
diff --git a/include/ipa/meson.build b/include/libcamera/ipa/meson.build
index 3d5c0dd6..3d5c0dd6 100644
--- a/include/ipa/meson.build
+++ b/include/libcamera/ipa/meson.build
diff --git a/include/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h
index c109469e..c109469e 100644
--- a/include/ipa/raspberrypi.h
+++ b/include/libcamera/ipa/raspberrypi.h
diff --git a/include/ipa/rkisp1.h b/include/libcamera/ipa/rkisp1.h
index 4fe0482b..4fe0482b 100644
--- a/include/ipa/rkisp1.h
+++ b/include/libcamera/ipa/rkisp1.h
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index f9c8e64b..32b8d142 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -24,6 +24,7 @@ libcamera_api = files([
 include_dir = join_paths(libcamera_include_dir, 'libcamera')
 
 subdir('internal')
+subdir('ipa')
 
 install_headers(libcamera_api,
                 subdir : include_dir)
diff --git a/include/meson.build b/include/meson.build
index 4f41c9ce..2ac9a3a0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -3,5 +3,4 @@
 libcamera_include_dir = 'libcamera'
 
 subdir('android')
-subdir('ipa')
 subdir('libcamera')