[libcamera-devel] [PATCH 1/3] libcamera: pipeline: Move uvcvideo and vimc to subdirectories

[Kieran Bingham]

Hi Laurent,

On 25/03/2020 08:58, Laurent Pinchart wrote:
> Give a subdirectory to all pipeline handlers to make the structure of
> the source tree more consistent. This will also simplify the
> implementation of pipeline handlers selection at build time.

There's a time I would have said this was overkill, but I've seen patch
3/3 and I like it ...

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  src/libcamera/pipeline/meson.build                 | 7 ++-----
>  src/libcamera/pipeline/uvcvideo/meson.build        | 3 +++
>  src/libcamera/pipeline/{ => uvcvideo}/uvcvideo.cpp | 0
>  src/libcamera/pipeline/vimc/meson.build            | 3 +++
>  src/libcamera/pipeline/{ => vimc}/vimc.cpp         | 0
>  5 files changed, 8 insertions(+), 5 deletions(-)
>  create mode 100644 src/libcamera/pipeline/uvcvideo/meson.build
>  rename src/libcamera/pipeline/{ => uvcvideo}/uvcvideo.cpp (100%)
>  create mode 100644 src/libcamera/pipeline/vimc/meson.build
>  rename src/libcamera/pipeline/{ => vimc}/vimc.cpp (100%)
> 
> diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build
> index 0d466225a72e..c1a6ab0484f0 100644
> --- a/src/libcamera/pipeline/meson.build
> +++ b/src/libcamera/pipeline/meson.build
> @@ -1,7 +1,4 @@
> -libcamera_sources += files([
> -    'uvcvideo.cpp',
> -    'vimc.cpp',
> -])
> -
>  subdir('ipu3')
>  subdir('rkisp1')
> +subdir('uvcvideo')
> +subdir('vimc')
> diff --git a/src/libcamera/pipeline/uvcvideo/meson.build b/src/libcamera/pipeline/uvcvideo/meson.build
> new file mode 100644
> index 000000000000..c19ae2389f48
> --- /dev/null
> +++ b/src/libcamera/pipeline/uvcvideo/meson.build
> @@ -0,0 +1,3 @@
> +libcamera_sources += files([
> +    'uvcvideo.cpp',
> +])
> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
> similarity index 100%
> rename from src/libcamera/pipeline/uvcvideo.cpp
> rename to src/libcamera/pipeline/uvcvideo/uvcvideo.cpp
> diff --git a/src/libcamera/pipeline/vimc/meson.build b/src/libcamera/pipeline/vimc/meson.build
> new file mode 100644
> index 000000000000..615ecd20f1a2
> --- /dev/null
> +++ b/src/libcamera/pipeline/vimc/meson.build
> @@ -0,0 +1,3 @@
> +libcamera_sources += files([
> +    'vimc.cpp',
> +])
> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp
> similarity index 100%
> rename from src/libcamera/pipeline/vimc.cpp
> rename to src/libcamera/pipeline/vimc/vimc.cpp
> 

-- 
Regards
--
Kieran