From patchwork Wed Aug 26 11:09:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 9391 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 5A0A3BD87E for ; Wed, 26 Aug 2020 11:10:07 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2799B628FB; Wed, 26 Aug 2020 13:10:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="vru6uA2s"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0D3FD62907 for ; Wed, 26 Aug 2020 13:10:06 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4EB59B1A; Wed, 26 Aug 2020 13:10:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598440205; bh=ngP6sy7t2uHFyW6y24HqCIEjGtzPS1EMbL7VH5eleDg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vru6uA2skR6ITDL+/u/15XX/Z+k+zLPW6jWWVvC0WMoGXPz14zI69eCXOiYQYAz/v eO1E0AC4TtK0qvmUFn+R7KBMbffqd7aHWEA4nBnTMOBtiW7bFcvWw622+TmFGKbH7c dGNQeU7hmkH3QHEKwBFuCGbawlPZo/mgW9QTG93Y= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Wed, 26 Aug 2020 20:09:16 +0900 Message-Id: <20200826110926.67192-8-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200826110926.67192-1-paul.elder@ideasonboard.com> References: <20200826110926.67192-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 07/17] meson: Enable IPC X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 --- 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(-) 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')