From 2b6c1d0e568bbac46a170ec4c38193e5ac661d43 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Fri, 30 Oct 2020 11:58:14 +0000 Subject: DocumentationUseOnly: Force enable Vivid To make sure we always build the Vivid pipeline in this branch, explicitly add it to the build targets, and remove it from the pipeline configuration choices. This is not any kind of best practice for pipeline handlers, but is here to ensure that this pipeline is always compiled on this branch who's sole purpose is to use and demonstrate the vivid pipeline handler. --- meson_options.txt | 2 +- src/libcamera/pipeline/meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index a36a61db..2c80ad8b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -37,7 +37,7 @@ option('lc-compliance', option('pipelines', type : 'array', - choices : ['ipu3', 'raspberrypi', 'rkisp1', 'simple', 'uvcvideo', 'vimc', 'vivid'], + choices : ['ipu3', 'raspberrypi', 'rkisp1', 'simple', 'uvcvideo', 'vimc'], description : 'Select which pipeline handlers to include') option('qcam', diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build index 30dc5b97..733aa737 100644 --- a/src/libcamera/pipeline/meson.build +++ b/src/libcamera/pipeline/meson.build @@ -3,3 +3,5 @@ foreach pipeline : pipelines subdir(pipeline) endforeach + +subdir('vivid') -- cgit v1.2.1