libcamera: Split public and internal source arrays

Meson array variables hold lists of libcamera's source files. To help
facilitate the splitting of Doxygen generated documentation into
distinct public and internal versions, split those arrays to separate
public and internal variables.

Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
Co-developed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Documentation/guides/pipeline-handler.rst

@@ -151,13 +151,14 @@ integrates with the libcamera build system, and a *vivid.cpp* file that matches
 the name of the pipeline.
 
 In the *meson.build* file, add the *vivid.cpp* file as a build source for
-libcamera by adding it to the global meson ``libcamera_sources`` variable:
+libcamera by adding it to the global meson ``libcamera_internal_sources``
+variable:
 
 .. code-block:: none
 
    # SPDX-License-Identifier: CC0-1.0
 
-   libcamera_sources += files([
+   libcamera_internal_sources += files([
        'vivid.cpp',
    ])
 

Documentation/meson.build

@@ -31,12 +31,14 @@ if doxygen.found() and dot.found()
     doxygen_input = [
         doxyfile,
         libcamera_base_headers,
-        libcamera_base_sources,
+        libcamera_base_public_sources,
+        libcamera_base_internal_sources,
         libcamera_internal_headers,
         libcamera_ipa_headers,
         libcamera_ipa_interfaces,
         libcamera_public_headers,
-        libcamera_sources,
+        libcamera_public_sources,
+        libcamera_internal_sources,
         libipa_headers,
         libipa_sources,
     ]

src/libcamera/base/meson.build

@@ -1,25 +1,28 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_base_sources = files([
+libcamera_base_public_sources = files([
-    'backtrace.cpp',
-    'class.cpp',
     'bound_method.cpp',
+    'class.cpp',
+    'flags.cpp',
+    'object.cpp',
+    'shared_fd.cpp',
+    'signal.cpp',
+    'unique_fd.cpp',
+])
+
+libcamera_base_internal_sources = files([
+    'backtrace.cpp',
     'event_dispatcher.cpp',
     'event_dispatcher_poll.cpp',
     'event_notifier.cpp',
     'file.cpp',
-    'flags.cpp',
     'log.cpp',
     'memfd.cpp',
     'message.cpp',
     'mutex.cpp',
-    'object.cpp',
     'semaphore.cpp',
-    'shared_fd.cpp',
-    'signal.cpp',
     'thread.cpp',
     'timer.cpp',
-    'unique_fd.cpp',
     'utils.cpp',
 ])
 
@@ -50,7 +53,11 @@ libcamera_base_deps = [
 libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ]
 
 libcamera_base_lib = shared_library('libcamera-base',
-                                    [libcamera_base_sources, libcamera_base_headers],
+                                    [
+                                        libcamera_base_public_sources,
+                                        libcamera_base_internal_sources,
+                                        libcamera_base_headers,
+                                    ],
                                     version : libcamera_version,
                                     soversion : libcamera_soversion,
                                     name_prefix : '',

src/libcamera/converter/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
         'converter_v4l2_m2m.cpp'
 ])

src/libcamera/meson.build

@@ -1,14 +1,26 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources = files([
+libcamera_public_sources = files([
-    'bayer_format.cpp',
-    'byte_stream_buffer.cpp',
     'camera.cpp',
-    'camera_controls.cpp',
-    'camera_lens.cpp',
     'camera_manager.cpp',
     'color_space.cpp',
     'controls.cpp',
+    'fence.cpp',
+    'framebuffer.cpp',
+    'framebuffer_allocator.cpp',
+    'geometry.cpp',
+    'orientation.cpp',
+    'pixel_format.cpp',
+    'request.cpp',
+    'stream.cpp',
+    'transform.cpp',
+])
+
+libcamera_internal_sources = files([
+    'bayer_format.cpp',
+    'byte_stream_buffer.cpp',
+    'camera_controls.cpp',
+    'camera_lens.cpp',
     'control_serializer.cpp',
     'control_validator.cpp',
     'converter.cpp',
@@ -16,11 +28,7 @@ libcamera_sources = files([
     'device_enumerator.cpp',
     'device_enumerator_sysfs.cpp',
     'dma_buf_allocator.cpp',
-    'fence.cpp',
     'formats.cpp',
-    'framebuffer.cpp',
-    'framebuffer_allocator.cpp',
-    'geometry.cpp',
     'ipa_controls.cpp',
     'ipa_data_serializer.cpp',
     'ipa_interface.cpp',
@@ -33,17 +41,12 @@ libcamera_sources = files([
     'mapped_framebuffer.cpp',
     'media_device.cpp',
     'media_object.cpp',
-    'orientation.cpp',
     'pipeline_handler.cpp',
-    'pixel_format.cpp',
     'process.cpp',
     'pub_key.cpp',
-    'request.cpp',
     'shared_mem_object.cpp',
     'source_paths.cpp',
-    'stream.cpp',
     'sysfs.cpp',
-    'transform.cpp',
     'v4l2_device.cpp',
     'v4l2_pixelformat.cpp',
     'v4l2_subdevice.cpp',
@@ -51,9 +54,9 @@ libcamera_sources = files([
     'yaml_parser.cpp',
 ])
 
-libcamera_sources += libcamera_public_headers
+libcamera_public_sources += libcamera_public_headers
-libcamera_sources += libcamera_generated_ipa_headers
+libcamera_internal_sources += libcamera_generated_ipa_headers
-libcamera_sources += libcamera_tracepoint_header
+libcamera_internal_sources += libcamera_tracepoint_header
 
 includes = [
     libcamera_includes,
@@ -104,14 +107,14 @@ endif
 if liblttng.found()
     tracing_enabled = true
     config_h.set('HAVE_TRACING', 1)
-    libcamera_sources += files(['tracepoints.cpp'])
+    libcamera_internal_sources += files(['tracepoints.cpp'])
 else
     tracing_enabled = false
 endif
 
 if libudev.found()
     config_h.set('HAVE_LIBUDEV', 1)
-    libcamera_sources += files([
+    libcamera_internal_sources += files([
         'device_enumerator_udev.cpp',
     ])
 endif
@@ -152,7 +155,7 @@ foreach mode, input_files : controls_mode_files
                                                 '-r', ranges_file, '@INPUT@'])
 endforeach
 
-libcamera_sources += control_sources
+libcamera_public_sources += control_sources
 
 gen_version = meson.project_source_root() / 'utils' / 'gen-version.sh'
 
@@ -163,7 +166,7 @@ version_cpp = vcs_tag(command : [gen_version, meson.project_build_root(), meson.
                       output : 'version.cpp',
                       fallback : meson.project_version())
 
-libcamera_sources += version_cpp
+libcamera_public_sources += version_cpp
 
 if ipa_sign_module
     ipa_pub_key_cpp = custom_target('ipa_pub_key_cpp',
@@ -171,7 +174,7 @@ if ipa_sign_module
                                     output : 'ipa_pub_key.cpp',
                                     command : [gen_ipa_pub_key, '@INPUT@', '@OUTPUT@'])
 
-    libcamera_sources += ipa_pub_key_cpp
+    libcamera_internal_sources += ipa_pub_key_cpp
 endif
 
 libcamera_deps += [
@@ -191,7 +194,10 @@ libcamera_deps += [
 # for the presence or abscence of the dynamic tag.
 
 libcamera = shared_library('libcamera',
-                           libcamera_sources,
+                           [
+                               libcamera_public_sources,
+                               libcamera_internal_sources,
+                           ],
                            version : libcamera_version,
                            soversion : libcamera_soversion,
                            name_prefix : '',

src/libcamera/pipeline/imx8-isi/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'imx8-isi.cpp'
 ])

src/libcamera/pipeline/ipu3/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'cio2.cpp',
     'frames.cpp',
     'imgu.cpp',

src/libcamera/pipeline/mali-c55/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'mali-c55.cpp'
 ])

src/libcamera/pipeline/rkisp1/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'rkisp1.cpp',
     'rkisp1_path.cpp',
 ])

src/libcamera/pipeline/rpi/common/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'delayed_controls.cpp',
     'pipeline_base.cpp',
     'rpi_stream.cpp',

src/libcamera/pipeline/rpi/vc4/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'vc4.cpp',
 ])
 

src/libcamera/pipeline/simple/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'simple.cpp',
 ])

src/libcamera/pipeline/uvcvideo/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'uvcvideo.cpp',
 ])

src/libcamera/pipeline/vimc/meson.build

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'vimc.cpp',
 ])

src/libcamera/proxy/meson.build

@@ -15,5 +15,5 @@ foreach mojom : ipa_mojoms
                               './' + '@INPUT@'
                           ])
 
-    libcamera_sources += proxy
+    libcamera_internal_sources += proxy
 endforeach

src/libcamera/sensor/meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: CC0-1.0
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'camera_sensor.cpp',
     'camera_sensor_properties.cpp',
 ])

src/libcamera/software_isp/meson.build

@@ -7,7 +7,7 @@ if not softisp_enabled
     subdir_done()
 endif
 
-libcamera_sources += files([
+libcamera_internal_sources += files([
     'debayer.cpp',
     'debayer_cpu.cpp',
     'software_isp.cpp',