[libcamera-devel,RFC,07/17] meson: Enable IPC

Message ID 20200826110926.67192-8-paul.elder@ideasonboard.com
State Superseded
Headers show
Series
  • [libcamera-devel,RFC,01/17] IPA: IPC: raspberrypi: Add data definition and generated header
Related show

Commit Message

Paul Elder Aug. 26, 2020, 11:09 a.m. UTC
Enable compilation of all components necessary for IPA over IPC, and
disable components that prevent it from working.

Note that this patch is not complete. Instead of commenting out
compilation units, for example, they should simply be removed. This
patch is merely to get IPC runnable for the purpose of the RFC.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
---
 src/ipa/libipa/meson.build             | 4 ++--
 src/libcamera/meson.build              | 5 ++++-
 src/libcamera/proxy/meson.build        | 5 +++--
 src/libcamera/proxy/worker/meson.build | 3 ++-
 4 files changed, 11 insertions(+), 6 deletions(-)

Patch

diff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build
index 22626405..8335fff6 100644
--- a/src/ipa/libipa/meson.build
+++ b/src/ipa/libipa/meson.build
@@ -1,11 +1,11 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
 libipa_headers = files([
-    'ipa_interface_wrapper.h',
+    #'ipa_interface_wrapper.h',
 ])
 
 libipa_sources = files([
-    'ipa_interface_wrapper.cpp',
+    #'ipa_interface_wrapper.cpp',
 ])
 
 libipa_includes = include_directories('..')
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index af2f3d95..8c6a33ac 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -21,8 +21,11 @@  libcamera_sources = files([
     'formats.cpp',
     'framebuffer_allocator.cpp',
     'geometry.cpp',
-    'ipa_context_wrapper.cpp',
+    #'ipa_context_wrapper.cpp',
     'ipa_controls.cpp',
+    'ipa_data_serializer.cpp',
+    'ipa_ipc.cpp',
+    'ipa_ipc_unixsocket.cpp',
     'ipa_interface.cpp',
     'ipa_manager.cpp',
     'ipa_module.cpp',
diff --git a/src/libcamera/proxy/meson.build b/src/libcamera/proxy/meson.build
index bd804750..11101882 100644
--- a/src/libcamera/proxy/meson.build
+++ b/src/libcamera/proxy/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
 libcamera_sources += files([
-    'ipa_proxy_linux.cpp',
-    'ipa_proxy_thread.cpp',
+    #'ipa_proxy_linux.cpp',
+    'ipa_proxy_raspberrypi.cpp',
+    #'ipa_proxy_thread.cpp',
 ])
diff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build
index ac0310a7..8da38d5e 100644
--- a/src/libcamera/proxy/worker/meson.build
+++ b/src/libcamera/proxy/worker/meson.build
@@ -1,7 +1,8 @@ 
 # SPDX-License-Identifier: CC0-1.0
 
 ipa_proxy_sources = [
-    ['ipa_proxy_linux', 'ipa_proxy_linux_worker.cpp']
+    #['ipa_proxy_linux', 'ipa_proxy_linux_worker.cpp'],
+    ['ipa_proxy_raspberrypi', 'ipa_proxy_raspberrypi_worker.cpp']
 ]
 
 proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera')