[2/2] meson: Print missing application options in summary

26435 diff mbox series

The recently added application options (DNG output support, KMS and SDL2
outputs for cam, and JPEG support for cam) are not printed in the
summary. This makes it more difficult to quickly assess the
configuration when those options are set to the 'auto' value. Add them
to the summary, and move all application configuration options to a
dedicated section of the summary to improve readability.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 meson.build              |  3 ---
 src/apps/cam/meson.build |  5 +++++
 src/apps/meson.build     | 10 ++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

Hi Laurent

On Mon, Apr 06, 2026 at 12:33:49AM +0300, Laurent Pinchart wrote:
> The recently added application options (DNG output support, KMS and SDL2
> outputs for cam, and JPEG support for cam) are not printed in the
> summary. This makes it more difficult to quickly assess the
> configuration when those options are set to the 'auto' value. Add them
> to the summary, and move all application configuration options to a
> dedicated section of the summary to improve readability.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

This shows up as
  Applications
    cam application          : YES
    cam options              : output-kms
                               output-sdl2
                               jpeg
    DNG output support       : YES
    qcam application         : NO
    lc-compliance application: YES

in my local summary, which I think it's nice

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

> ---
>  meson.build              |  3 ---
>  src/apps/cam/meson.build |  5 +++++
>  src/apps/meson.build     | 10 ++++++++++
>  3 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 2e2a27ef4c25..a6cfdd07605c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -305,9 +305,6 @@ summary({
>              'GStreamer support': gst_enabled,
>              'Python bindings': pycamera_enabled,
>              'V4L2 emulation support': v4l2_enabled,
> -            'cam application': cam_enabled,
> -            'qcam application': qcam_enabled,
> -            'lc-compliance application': lc_compliance_enabled,
>              'Unit tests': test_enabled,
>          },
>          section : 'Configuration',
> diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build
> index 0fd8462700a9..067cfd81c64d 100644
> --- a/src/apps/cam/meson.build
> +++ b/src/apps/cam/meson.build
> @@ -26,6 +26,8 @@ cam_deps = [
>      libtiff,
>  ]
>
> +cam_options = []
> +
>  libdrm = dependency('libdrm', required : get_option('cam-output-kms'))
>  libsdl2 = dependency('SDL2', required : get_option('cam-output-sdl2'))
>  libjpeg = dependency('libjpeg', required : get_option('cam-jpeg'))
> @@ -39,6 +41,7 @@ if libdrm.found()
>      cam_deps += [
>          libdrm,
>      ]
> +    cam_options += 'output-kms'
>  endif
>
>  if libsdl2.found()
> @@ -52,6 +55,7 @@ if libsdl2.found()
>      cam_deps += [
>          libsdl2,
>      ]
> +    cam_options += 'output-sdl2'
>
>      if libjpeg.found()
>          cam_cpp_args += ['-DHAVE_LIBJPEG']
> @@ -61,6 +65,7 @@ if libsdl2.found()
>          cam_deps += [
>              libjpeg,
>          ]
> +        cam_options += 'jpeg'
>      endif
>  endif
>
> diff --git a/src/apps/meson.build b/src/apps/meson.build
> index bc3a79196949..bd2f7858e1a3 100644
> --- a/src/apps/meson.build
> +++ b/src/apps/meson.build
> @@ -20,3 +20,13 @@ subdir('cam')
>  subdir('qcam')
>
>  subdir('ipa-verify')
> +
> +summary({
> +            'cam application': cam_enabled,
> +            'cam options': cam_options,
> +            'DNG output support': libtiff.found(),
> +            'qcam application': qcam_enabled,
> +            'lc-compliance application': lc_compliance_enabled,
> +        },
> +        section : 'Applications',
> +        bool_yn : true)
> --
> Regards,
>
> Laurent Pinchart
>