{"id":20725,"url":"https://patchwork.libcamera.org/api/1.1/patches/20725/?format=json","web_url":"https://patchwork.libcamera.org/patch/20725/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240731135201.2866145-2-dan.scally@ideasonboard.com>","date":"2024-07-31T13:51:58","name":"[v4,1/4] meson: libcamera: Split public and internal source arrays","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2bf10d19fa583b82eea01868ca9b358763b6a49e","submitter":{"id":156,"url":"https://patchwork.libcamera.org/api/1.1/people/156/?format=json","name":"Dan Scally","email":"dan.scally@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20725/mbox/","series":[{"id":4469,"url":"https://patchwork.libcamera.org/api/1.1/series/4469/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4469","date":"2024-07-31T13:51:57","name":"Improve libcamera documentation","version":4,"mbox":"https://patchwork.libcamera.org/series/4469/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20725/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20725/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 65394C323E\n\tfor ;\n\tWed, 31 Jul 2024 13:52:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8007263377;\n\tWed, 31 Jul 2024 15:52:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 14CE76336F\n\tfor ;\n\tWed, 31 Jul 2024 15:52:17 +0200 (CEST)","from mail.ideasonboard.com\n\t(cpc141996-chfd3-2-0-cust928.12-3.cable.virginm.net [86.13.91.161])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2FEAB144C;\n\tWed, 31 Jul 2024 15:51:29 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"a8sdwjKV\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1722433889;\n\tbh=nsOrX3PBiE3XNCUip72vQ+s0I9eV8sVLuBq7DLojLIQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=a8sdwjKVUHYAPplIvArLsC7XoD8NPrsV9660wbJ3pawEvcrRC+qeDvTtcPKc+JHta\n\tLQlmmVeTGXRXjBhCfmCXpYjC4ue1PJd99pZUKfpHaCgtRaOGX/BDTOTTSuvuC3xBrU\n\tXHpUL9DSKNJJwAjpVCSSX1YQlK5xgSOna0mZojy8=","From":"Daniel Scally ","To":"libcamera-devel@lists.libcamera.org","Cc":"Daniel Scally ,\n\tLaurent Pinchart ","Subject":"[PATCH v4 1/4] meson: libcamera: Split public and internal source\n\tarrays","Date":"Wed, 31 Jul 2024 14:51:58 +0100","Message-Id":"<20240731135201.2866145-2-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240731135201.2866145-1-dan.scally@ideasonboard.com>","References":"<20240731135201.2866145-1-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Meson array variables hold lists of libcamera's source files. To help\nfacilitate the splitting of Doxygen generated documentation into\ndistinct public and internal versions, split those arrays to separate\npublic and internal variables.\n\nReviewed-by: Laurent Pinchart \nSigned-off-by: Daniel Scally \n---\nChanges in v4:\n\n\t- Missing comma\n\nChanges in v3:\n\n\t- Didn't swap span.h to private array\n\t- dropped _publically from array name\n\nChanges in v2:\n\n\t- New patch\n\n include/libcamera/internal/meson.build | 21 +++++++++++----\n src/libcamera/base/meson.build | 24 +++++++++++------\n src/libcamera/meson.build | 36 ++++++++++++++++----------\n src/libcamera/sensor/meson.build | 5 ++++\n 4 files changed, 59 insertions(+), 27 deletions(-)","diff":"diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 9713ea1c..76c939bf 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -9,13 +9,21 @@ libcamera_tracepoint_header = custom_target(\n command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],\n )\n \n-libcamera_internal_headers = files([\n+# Where libcamera's public API classes have Extensible::Private counterparts we\n+# need to include them in doxygen's public API run or it will complain that the\n+# functions defined in the \"public\" source are undeclared.\n+libcamera_internal_headers_documented = files([\n+ 'camera.h',\n+ 'camera_manager.h',\n+ 'framebuffer.h',\n+ 'request.h',\n+])\n+\n+libcamera_internal_headers_undocumented = files([\n 'bayer_format.h',\n 'byte_stream_buffer.h',\n- 'camera.h',\n 'camera_controls.h',\n 'camera_lens.h',\n- 'camera_manager.h',\n 'camera_sensor.h',\n 'camera_sensor_properties.h',\n 'control_serializer.h',\n@@ -27,7 +35,6 @@ libcamera_internal_headers = files([\n 'device_enumerator_udev.h',\n 'dma_buf_allocator.h',\n 'formats.h',\n- 'framebuffer.h',\n 'ipa_manager.h',\n 'ipa_module.h',\n 'ipa_proxy.h',\n@@ -38,7 +45,6 @@ libcamera_internal_headers = files([\n 'pipeline_handler.h',\n 'process.h',\n 'pub_key.h',\n- 'request.h',\n 'shared_mem_object.h',\n 'source_paths.h',\n 'sysfs.h',\n@@ -49,5 +55,10 @@ libcamera_internal_headers = files([\n 'yaml_parser.h',\n ])\n \n+libcamera_internal_headers = [\n+ libcamera_internal_headers_documented,\n+ libcamera_internal_headers_undocumented,\n+]\n+\n subdir('converter')\n subdir('software_isp')\ndiff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build\nindex 7a7fd7e4..523c5885 100644\n--- a/src/libcamera/base/meson.build\n+++ b/src/libcamera/base/meson.build\n@@ -1,27 +1,35 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_base_sources = files([\n- 'backtrace.cpp',\n- 'class.cpp',\n+libcamera_base_public_sources = files([\n 'bound_method.cpp',\n+ 'class.cpp',\n+ 'flags.cpp',\n+ 'object.cpp',\n+ 'shared_fd.cpp',\n+ 'signal.cpp',\n+ 'unique_fd.cpp',\n+])\n+\n+libcamera_base_internal_sources = files([\n+ 'backtrace.cpp',\n 'event_dispatcher.cpp',\n 'event_dispatcher_poll.cpp',\n 'event_notifier.cpp',\n 'file.cpp',\n- 'flags.cpp',\n 'log.cpp',\n 'message.cpp',\n 'mutex.cpp',\n- 'object.cpp',\n 'semaphore.cpp',\n- 'shared_fd.cpp',\n- 'signal.cpp',\n 'thread.cpp',\n 'timer.cpp',\n- 'unique_fd.cpp',\n 'utils.cpp',\n ])\n \n+libcamera_base_sources = [\n+\tlibcamera_base_public_sources,\n+\tlibcamera_base_internal_sources\n+]\n+\n libdw = dependency('libdw', required : false)\n libunwind = dependency('libunwind', required : false)\n \ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 89504cee..9c74241d 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -1,14 +1,26 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_sources = files([\n- 'bayer_format.cpp',\n- 'byte_stream_buffer.cpp',\n+libcamera_public_sources = files([\n 'camera.cpp',\n- 'camera_controls.cpp',\n- 'camera_lens.cpp',\n 'camera_manager.cpp',\n 'color_space.cpp',\n 'controls.cpp',\n+ 'fence.cpp',\n+ 'framebuffer.cpp',\n+ 'framebuffer_allocator.cpp',\n+ 'geometry.cpp',\n+ 'orientation.cpp',\n+ 'pixel_format.cpp',\n+ 'request.cpp',\n+ 'stream.cpp',\n+ 'transform.cpp',\n+])\n+\n+libcamera_internal_sources = files([\n+ 'bayer_format.cpp',\n+ 'byte_stream_buffer.cpp',\n+ 'camera_controls.cpp',\n+ 'camera_lens.cpp',\n 'control_serializer.cpp',\n 'control_validator.cpp',\n 'converter.cpp',\n@@ -16,11 +28,7 @@ libcamera_sources = files([\n 'device_enumerator.cpp',\n 'device_enumerator_sysfs.cpp',\n 'dma_buf_allocator.cpp',\n- 'fence.cpp',\n 'formats.cpp',\n- 'framebuffer.cpp',\n- 'framebuffer_allocator.cpp',\n- 'geometry.cpp',\n 'ipa_controls.cpp',\n 'ipa_data_serializer.cpp',\n 'ipa_interface.cpp',\n@@ -33,17 +41,12 @@ libcamera_sources = files([\n 'mapped_framebuffer.cpp',\n 'media_device.cpp',\n 'media_object.cpp',\n- 'orientation.cpp',\n 'pipeline_handler.cpp',\n- 'pixel_format.cpp',\n 'process.cpp',\n 'pub_key.cpp',\n- 'request.cpp',\n 'shared_mem_object.cpp',\n 'source_paths.cpp',\n- 'stream.cpp',\n 'sysfs.cpp',\n- 'transform.cpp',\n 'v4l2_device.cpp',\n 'v4l2_pixelformat.cpp',\n 'v4l2_subdevice.cpp',\n@@ -51,6 +54,11 @@ libcamera_sources = files([\n 'yaml_parser.cpp',\n ])\n \n+libcamera_sources = [\n+\tlibcamera_public_sources,\n+\tlibcamera_internal_sources\n+]\n+\n libcamera_sources += libcamera_public_headers\n libcamera_sources += libcamera_generated_ipa_headers\n libcamera_sources += libcamera_tracepoint_header\ndiff --git a/src/libcamera/sensor/meson.build b/src/libcamera/sensor/meson.build\nindex bf4b131a..1c1fc5a4 100644\n--- a/src/libcamera/sensor/meson.build\n+++ b/src/libcamera/sensor/meson.build\n@@ -1,5 +1,10 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+libcamera_internal_sources += files([\n+ 'camera_sensor.cpp',\n+ 'camera_sensor_properties.cpp',\n+])\n+\n libcamera_sources += files([\n 'camera_sensor.cpp',\n 'camera_sensor_properties.cpp',\n","prefixes":["v4","1/4"]}