{"id":1969,"url":"https://patchwork.libcamera.org/api/patches/1969/?format=json","web_url":"https://patchwork.libcamera.org/patch/1969/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190914234806.5205-1-laurent.pinchart@ideasonboard.com>","date":"2019-09-14T23:48:06","name":"[libcamera-devel] libcamera: Move ipa includes to the same level as libcamera","commit_ref":"1e704c84a946f988c290169f060aa088d53fc4a8","pull_url":null,"state":"accepted","archived":false,"hash":"c77ac14b305a0cf3be44a45837eac91d8e29b244","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1969/mbox/","series":[{"id":491,"url":"https://patchwork.libcamera.org/api/series/491/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=491","date":"2019-09-14T23:48:06","name":"[libcamera-devel] libcamera: Move ipa includes to the same level as libcamera","version":1,"mbox":"https://patchwork.libcamera.org/series/491/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1969/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1969/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 99DAE60C05\n\tfor ;\n\tSun, 15 Sep 2019 01:48:20 +0200 (CEST)","from pendragon.lan (unknown\n\t[IPv6:2001:8a0:6be4:9301:a728:6099:33:a27c])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 62AF123F\n\tfor ;\n\tSun, 15 Sep 2019 01:48:19 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1568504900;\n\tbh=mPtObLmxGuBhOQFw0SrV0kXNE0KxWiYgvjOGqEgoLvE=;\n\th=From:To:Subject:Date:From;\n\tb=R/luYlvRwycmoaLe4spmQQ4kOnY5K2K0E1aVrMKuM+irYHMC2OAOZSsRDcgMqexeN\n\t5FTrGTp5qvoomz7MVkTNmyhV332XiiSKzuHUaWlxafqLHRga/N1Sp0zStaXa+Vx1tF\n\toAfCHtP0Sas/63G10a2mZ1jt1gxCWzKEZLrq31+Q=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 15 Sep 2019 02:48:06 +0300","Message-Id":"<20190914234806.5205-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: Move ipa includes to the same\n\tlevel as libcamera","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 14 Sep 2019 23:48:20 -0000"},"content":"The ipa includes are located in include/libcamera/ipa/. This gives an\nincorrect impression that they are a sub-part of the rest of the\nlibcamera API, while they are the API towards the IPA the same way that\ninclude/libcamera/ contains the API towards applications. To clarify\nthis, move them to include/ipa/.\n\nThe IPA headers are however still part of libcamera, so installing them\nto ${prefix}/include/ipa/ would make little sense. To fix this, move the\napplication facing API to ${prefix}/include/libcamera/libcamera/ when\ninstalled, and the IPA to ${prefix}/include/libcamera/ipa/. When major\nversions of libcamera will be released, they could then be installed\nside by side in ${prefix}/include/libcamera-${version}/.\n\nSigned-off-by: Laurent Pinchart \n---\n Documentation/Doxyfile.in | 4 +++-\n Documentation/meson.build | 1 +\n include/{libcamera => }/ipa/ipa_interface.h | 0\n include/{libcamera => }/ipa/ipa_module_info.h | 0\n include/ipa/meson.build | 7 +++++++\n include/libcamera/meson.build | 10 +++++-----\n include/meson.build | 3 +++\n src/ipa/ipa_dummy.cpp | 4 ++--\n src/ipa/ipa_dummy_isolate.cpp | 4 ++--\n src/libcamera/include/ipa_manager.h | 4 ++--\n src/libcamera/include/ipa_module.h | 4 ++--\n src/libcamera/include/ipa_proxy.h | 2 +-\n src/libcamera/ipa_interface.cpp | 2 +-\n src/libcamera/meson.build | 2 +-\n src/libcamera/pipeline/vimc.cpp | 4 ++--\n src/libcamera/proxy/ipa_proxy_linux.cpp | 4 ++--\n src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp | 2 +-\n 17 files changed, 35 insertions(+), 22 deletions(-)\n rename include/{libcamera => }/ipa/ipa_interface.h (100%)\n rename include/{libcamera => }/ipa/ipa_module_info.h (100%)\n create mode 100644 include/ipa/meson.build","diff":"diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in\nindex db939abc8319..ecc058eec683 100644\n--- a/Documentation/Doxyfile.in\n+++ b/Documentation/Doxyfile.in\n@@ -791,7 +791,9 @@ WARN_LOGFILE =\n # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING\n # Note: If this tag is empty the current directory is searched.\n \n-INPUT = \"@TOP_SRCDIR@/include/libcamera\" \"@TOP_SRCDIR@/src/libcamera\"\n+INPUT = \"@TOP_SRCDIR@/include/ipa\" \\\n+\t\t\t \"@TOP_SRCDIR@/include/libcamera\" \\\n+\t\t\t \"@TOP_SRCDIR@/src/libcamera\"\n \n # This tag can be used to specify the character encoding of the source files\n # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses\ndiff --git a/Documentation/meson.build b/Documentation/meson.build\nindex a560d02abfa5..4ff3fbeb0674 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -21,6 +21,7 @@ if doxygen.found()\n input : [\n doxyfile,\n libcamera_api,\n+ libcamera_ipa_api,\n libcamera_headers,\n libcamera_sources,\n ],\ndiff --git a/include/libcamera/ipa/ipa_interface.h b/include/ipa/ipa_interface.h\nsimilarity index 100%\nrename from include/libcamera/ipa/ipa_interface.h\nrename to include/ipa/ipa_interface.h\ndiff --git a/include/libcamera/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h\nsimilarity index 100%\nrename from include/libcamera/ipa/ipa_module_info.h\nrename to include/ipa/ipa_module_info.h\ndiff --git a/include/ipa/meson.build b/include/ipa/meson.build\nnew file mode 100644\nindex 000000000000..a0ce96ba96c3\n--- /dev/null\n+++ b/include/ipa/meson.build\n@@ -0,0 +1,7 @@\n+libcamera_ipa_api = files([\n+ 'ipa_interface.h',\n+ 'ipa_module_info.h',\n+])\n+\n+install_headers(libcamera_ipa_api,\n+ subdir: join_paths(libcamera_include_dir, 'ipa'))\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex a8a38a9b1db7..868f1a6bf1ab 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -8,8 +8,6 @@ libcamera_api = files([\n 'event_dispatcher.h',\n 'event_notifier.h',\n 'geometry.h',\n- 'ipa/ipa_interface.h',\n- 'ipa/ipa_module_info.h',\n 'logging.h',\n 'object.h',\n 'request.h',\n@@ -18,6 +16,8 @@ libcamera_api = files([\n 'timer.h',\n ])\n \n+include_dir = join_paths(libcamera_include_dir, 'libcamera')\n+\n gen_header = files('gen-header.sh')\n \n libcamera_h = custom_target('gen-header',\n@@ -25,7 +25,7 @@ libcamera_h = custom_target('gen-header',\n output : 'libcamera.h',\n command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],\n install : true,\n- install_dir : 'include/libcamera')\n+ install_dir : join_paths('include', include_dir))\n \n version = libcamera_version.split('.')\n libcamera_version_config = configuration_data()\n@@ -36,7 +36,7 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])\n configure_file(input : 'version.h.in',\n output : 'version.h',\n configuration : libcamera_version_config,\n- install_dir : 'include/libcamera')\n+ install_dir : join_paths('include', include_dir))\n \n install_headers(libcamera_api,\n- subdir : 'libcamera')\n+ subdir : include_dir)\ndiff --git a/include/meson.build b/include/meson.build\nindex a89c0d7f9e40..42b2453445b5 100644\n--- a/include/meson.build\n+++ b/include/meson.build\n@@ -1,2 +1,5 @@\n+libcamera_include_dir = 'libcamera'\n+\n subdir('android')\n+subdir('ipa')\n subdir('libcamera')\ndiff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp\nindex 4c8b6657689d..9313aabd2db8 100644\n--- a/src/ipa/ipa_dummy.cpp\n+++ b/src/ipa/ipa_dummy.cpp\n@@ -7,8 +7,8 @@\n \n #include \n \n-#include \n-#include \n+#include \n+#include \n \n namespace libcamera {\n \ndiff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp\nindex 24434e85d318..cd66626df2df 100644\n--- a/src/ipa/ipa_dummy_isolate.cpp\n+++ b/src/ipa/ipa_dummy_isolate.cpp\n@@ -8,8 +8,8 @@\n \n #include \n \n-#include \n-#include \n+#include \n+#include \n \n namespace libcamera {\n \ndiff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 310ce7c85e84..126f8babbc8f 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -9,8 +9,8 @@\n \n #include \n \n-#include \n-#include \n+#include \n+#include \n \n #include \"ipa_module.h\"\n #include \"pipeline_handler.h\"\ndiff --git a/src/libcamera/include/ipa_module.h b/src/libcamera/include/ipa_module.h\nindex 18e9223f028d..97737587ab3a 100644\n--- a/src/libcamera/include/ipa_module.h\n+++ b/src/libcamera/include/ipa_module.h\n@@ -10,8 +10,8 @@\n #include \n #include \n \n-#include \n-#include \n+#include \n+#include \n \n #include \"pipeline_handler.h\"\n \ndiff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h\nindex ac57699be949..72216662e373 100644\n--- a/src/libcamera/include/ipa_proxy.h\n+++ b/src/libcamera/include/ipa_proxy.h\n@@ -11,7 +11,7 @@\n #include \n #include \n \n-#include \n+#include \n \n #include \"ipa_module.h\"\n #include \"utils.h\"\ndiff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp\nindex 9d30da29228f..d7d8ca8881ef 100644\n--- a/src/libcamera/ipa_interface.cpp\n+++ b/src/libcamera/ipa_interface.cpp\n@@ -5,7 +5,7 @@\n * ipa_interface.cpp - Image Processing Algorithm interface\n */\n \n-#include \n+#include \n \n /**\n * \\file ipa_interface.h\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 0706a08b270b..0916bc411360 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -120,7 +120,7 @@ libcamera = shared_library('camera',\n include_directories : includes,\n dependencies : libcamera_deps)\n \n-libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_h],\n+libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],\n include_directories : libcamera_includes,\n link_with : libcamera)\n \ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex f8f91d6219b1..f26a91f86ec1 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -12,10 +12,10 @@\n \n #include \n \n+#include \n+#include \n #include \n #include \n-#include \n-#include \n #include \n #include \n \ndiff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\nindex f881aab5b2e1..83a7425077ea 100644\n--- a/src/libcamera/proxy/ipa_proxy_linux.cpp\n+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n@@ -7,8 +7,8 @@\n \n #include \n \n-#include \n-#include \n+#include \n+#include \n \n #include \"ipa_module.h\"\n #include \"ipa_proxy.h\"\ndiff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\nindex ffba3ae4de80..a10761e52b32 100644\n--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n@@ -9,8 +9,8 @@\n #include \n #include \n \n+#include \n #include \n-#include \n #include \n \n #include \"ipa_module.h\"\n","prefixes":["libcamera-devel"]}