summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-25 09:36:35 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-25 12:20:52 +0200
commit5e8933eeebcedda55d4c4e84db9b4983eecefe1b (patch)
tree94aea75f4e4978fd1f33becfefc5460df042e865
parente74885c870a8d13736b422f8faadec3339cc588d (diff)
libcamera: pipeline: Move uvcvideo and vimc to subdirectories
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. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/libcamera/pipeline/meson.build7
-rw-r--r--src/libcamera/pipeline/uvcvideo/meson.build3
-rw-r--r--src/libcamera/pipeline/uvcvideo/uvcvideo.cpp (renamed from src/libcamera/pipeline/uvcvideo.cpp)0
-rw-r--r--src/libcamera/pipeline/vimc/meson.build3
-rw-r--r--src/libcamera/pipeline/vimc/vimc.cpp (renamed from src/libcamera/pipeline/vimc.cpp)0
5 files changed, 8 insertions, 5 deletions
diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build
index 0d466225..c1a6ab04 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 00000000..c19ae238
--- /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
index ffbddf27..ffbddf27 100644
--- a/src/libcamera/pipeline/uvcvideo.cpp
+++ b/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 00000000..615ecd20
--- /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
index b04a9726..b04a9726 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc/vimc.cpp