NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Don't override pipeline list when auto is selected

Browse source 
Consider `pipelines=auto,virtual`. Previously that would select
everything that `auto` would, but not actually enable the `virtual`
pipeline handler because the `pipelines` list was reset.

Bug: https://bugs.libcamera.org/show_bug.cgi?id=247
Signed-off-by: Barnabás Pőcze <pobrn@protonmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Barnabás Pőcze 2024-12-17 15:15:16 +00:00
parent a945532314
commit 2ae7b2ff74
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -204,7 +204,7 @@ liblttng = dependency('lttng-ust', required : get_option('tracing'))
# Pipeline handlers # Pipeline handlers
# #
pipelines = get_option('pipelines') wanted_pipelines = get_option('pipelines')
arch_arm = ['arm', 'aarch64'] arch_arm = ['arm', 'aarch64']
arch_x86 = ['x86', 'x86_64'] arch_x86 = ['x86', 'x86_64']
@ -220,16 +220,18 @@ pipelines_support = {
'virtual': ['test'], 'virtual': ['test'],
} }
if pipelines.contains('all') if wanted_pipelines.contains('all')
pipelines = pipelines_support.keys() pipelines = pipelines_support.keys()
elif pipelines.contains('auto') elif wanted_pipelines.contains('auto')
host_cpu = host_machine.cpu_family() host_cpu = host_machine.cpu_family()
pipelines = [] pipelines = []
foreach pipeline, archs : pipelines_support foreach pipeline, archs : pipelines_support
if host_cpu in archs or 'any' in archs if pipeline in wanted_pipelines or host_cpu in archs or 'any' in archs
pipelines += pipeline pipelines += pipeline
endif endif
endforeach endforeach
else
pipelines = wanted_pipelines
endif endif
# Tests require the vimc pipeline handler, include it automatically when tests # Tests require the vimc pipeline handler, include it automatically when tests