[libcamera-devel] [PATCH] meson: Remove pipelines list duplication
Robert Mader
robert.mader at posteo.de
Thu Jan 12 00:29:33 CET 2023
Hi! Just a drive-by comment:
On 12.01.23 00:22, Javier Martinez Canillas via libcamera-devel wrote:
> The supported pipelines are listed in three places: the meson_options.txt
> file, the defined array when a user selects -Dpipelines="all", and arrays
> defined when the default -Dpipelines="auto" is selected.
>
> This is hard to maintain and error prone, let's at least in the meson file
> have a single place where these pipelines lists are defined.
>
> Signed-off-by: Javier Martinez Canillas <javierm at redhat.com>
> ---
>
> meson.build | 31 +++++++++++++++++--------------
> 1 file changed, 17 insertions(+), 14 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 389c547206fb..f9e3280ec0f2 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -168,38 +168,41 @@ liblttng = dependency('lttng-ust', required : get_option('tracing'))
> # are enabled.
> pipelines = get_option('pipelines')
>
> +pipelines_aarch64 = ['imx8-isi', 'rkisp1']
> +pipelines_arm = ['raspberrypi', 'simple']
> +pipelines_agnostic = ['uvcvideo']
> +pipelines_test = ['vimc']
> +pipelines_x86 = ['ipu3']
> +
> if pipelines.contains('all')
> - pipelines = [
> - 'imx8-isi',
> - 'ipu3',
> - 'raspberrypi',
> - 'rkisp1',
> - 'simple',
> - 'uvcvideo',
> - 'vimc',
> - ]
> + pipelines = []
> + pipelines += pipelines_aarch64
> + pipelines += pipelines_arm
> + pipelines += pipelines_agnostic
> + pipelines += pipelines_test
> + pipelines += pipelines_x86
> endif
>
> if pipelines.contains('auto')
> host_cpu = host_machine.cpu_family()
> pipelines = []
> if host_cpu == 'x86' or host_cpu == 'x86_64'
> - pipelines += ['ipu3']
> + pipelines += pipelines_x86
> elif host_cpu == 'aarch64'
> - pipelines += ['imx8-isi', 'rkisp1']
> + pipelines += pipelines_aarch64
> endif
>
> if host_cpu == 'arm' or host_cpu == 'aarch64'
> - pipelines += ['raspberrypi', 'simple']
> + pipelines += pipeines_arm
Typo: pipeines_arm
> endif
>
> # Always include the uvcvideo pipeline handler.
> - pipelines += ['uvcvideo']
> + pipelines += pipelines_agnostic
> endif
>
> if get_option('test') and 'vimc' not in pipelines
> message('Enabling vimc pipeline handler to support tests')
> - pipelines += ['vimc']
> + pipelines += pipelines_test
> endif
>
> # Utilities are parsed first to provide support for other components.
More information about the libcamera-devel
mailing list