{"id":19373,"url":"https://patchwork.libcamera.org/api/1.1/patches/19373/?format=json","web_url":"https://patchwork.libcamera.org/patch/19373/","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":"<20240105164104.78398-3-dan.scally@ideasonboard.com>","date":"2024-01-05T16:41:01","name":"[libcamera-devel,v2,2/5] meson: libcamera: Split public and internal source arrays","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"488181e89b227f1c488131f75fe29be714e13b4a","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/19373/mbox/","series":[{"id":4134,"url":"https://patchwork.libcamera.org/api/1.1/series/4134/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4134","date":"2024-01-05T16:40:59","name":"Improve libcamera documentation","version":2,"mbox":"https://patchwork.libcamera.org/series/4134/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19373/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19373/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 4C06CC323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri,  5 Jan 2024 16:41:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EC8D862B40;\n\tFri,  5 Jan 2024 17:41:27 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5CD4E61D7F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri,  5 Jan 2024 17:41:22 +0100 (CET)","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 DE14F720;\n\tFri,  5 Jan 2024 17:40:20 +0100 (CET)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1704472888;\n\tbh=dwk3a9Y6xmTw3MwEuLMpOLZJyTebEKOIj/0Y3l2S380=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=brZWX7VET8xjhuBzoGfw9AFMsFSXwos/k08zDIeRSmvvUeSJ7qnYbvqARIsEhFWIY\n\t92DFVPIeJQApeAX/m7HxnhwobVAHpDLgWcZsEFmDb0cQT6t8CLcgJR1EltvVrtr8S6\n\tNMnWXRWlHYKMIOMBV6Fe8Abu91CzwpPfPvRdMq2o9L/rfjITrPSPQ4NOwjNmvMG/N8\n\tuMz/8F33antot873F0UUwYUvxcgLXX5NGydue8Z2F/G/SzU/82C43BBV7EV5EZgdxb\n\ttELgxsGv7jNNnVP+n69m9BZXY4mYPRKtO+UINaxWjcbAKWEfGkYnb599LGGyjP2AlH\n\tCDFnIyu7siZnw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1704472821;\n\tbh=dwk3a9Y6xmTw3MwEuLMpOLZJyTebEKOIj/0Y3l2S380=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Leo7BAL4E2ULe2UiD1Srh3VJQSSw85YjTwhkvLeMZxT2vDEy1GacROI64jmyBbkhn\n\tMVd1+fvqFMntN9+Xl3Sm36wMDjPtiFnIS5PuxVZS3AdV1Y1wqOWkMjJJDMqlrxdY1S\n\tz+0bnxmdzorc32fNkO7ET5P7Yta5ZEp2iAvThu0c="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Leo7BAL4\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri,  5 Jan 2024 16:41:01 +0000","Message-Id":"<20240105164104.78398-3-dan.scally@ideasonboard.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20240105164104.78398-1-dan.scally@ideasonboard.com>","References":"<20240105164104.78398-1-dan.scally@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/5] meson: libcamera: Split public and\n\tinternal source arrays","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","From":"Daniel Scally via libcamera-devel <libcamera-devel@lists.libcamera.org>","Reply-To":"Daniel Scally <dan.scally@ideasonboard.com>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"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\nSigned-off-by: Daniel Scally <dan.scally@ideasonboard.com>\n---\nChanges in v2:\n\n\t- New patch\n\n include/libcamera/base/meson.build     |  2 +-\n include/libcamera/internal/meson.build | 21 +++++++++++----\n src/libcamera/base/meson.build         | 24 +++++++++++------\n src/libcamera/meson.build              | 36 ++++++++++++++++----------\n 4 files changed, 55 insertions(+), 28 deletions(-)","diff":"diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build\nindex bace25d5..f24f47de 100644\n--- a/include/libcamera/base/meson.build\n+++ b/include/libcamera/base/meson.build\n@@ -10,7 +10,6 @@ libcamera_base_public_headers = files([\n     'object.h',\n     'shared_fd.h',\n     'signal.h',\n-    'span.h',\n     'unique_fd.h',\n ])\n \n@@ -25,6 +24,7 @@ libcamera_base_private_headers = files([\n     'mutex.h',\n     'private.h',\n     'semaphore.h',\n+    'span.h',\n     'thread.h',\n     'thread_annotations.h',\n     'timer.h',\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 7f1f3440..4d59cb2a 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_publically_documented = files([\n+    'camera.h',\n+    'camera_manager.h',\n+    'framebuffer.h',\n+    'request.h',\n+])\n+\n+libcamera_internal_headers_publically_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@@ -26,7 +34,6 @@ libcamera_internal_headers = files([\n     'device_enumerator_sysfs.h',\n     'device_enumerator_udev.h',\n     'formats.h',\n-    'framebuffer.h',\n     'ipa_manager.h',\n     'ipa_module.h',\n     'ipa_proxy.h',\n@@ -37,7 +44,6 @@ libcamera_internal_headers = files([\n     'pipeline_handler.h',\n     'process.h',\n     'pub_key.h',\n-    'request.h',\n     'source_paths.h',\n     'sysfs.h',\n     'v4l2_device.h',\n@@ -47,4 +53,9 @@ libcamera_internal_headers = files([\n     'yaml_parser.h',\n ])\n \n+libcamera_internal_headers = [\n+    libcamera_internal_headers_publically_documented,\n+    libcamera_internal_headers_publically_undocumented\n+]\n+\n subdir('converter')\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 45f63e93..676470c1 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -1,27 +1,35 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_sources = files([\n+libcamera_public_sources = files([\n+    'camera.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.cpp',\n     'camera_controls.cpp',\n     'camera_lens.cpp',\n-    'camera_manager.cpp',\n     'camera_sensor.cpp',\n     'camera_sensor_properties.cpp',\n-    'color_space.cpp',\n-    'controls.cpp',\n     'control_serializer.cpp',\n     'control_validator.cpp',\n     'converter.cpp',\n     'delayed_controls.cpp',\n     'device_enumerator.cpp',\n     'device_enumerator_sysfs.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@@ -34,16 +42,11 @@ 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     '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\n","prefixes":["libcamera-devel","v2","2/5"]}