From patchwork Wed Mar 25 08:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3317 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EE34C62BD6 for ; Wed, 25 Mar 2020 09:58:10 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fh6lTPGV"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 86B349D0 for ; Wed, 25 Mar 2020 09:58:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1585126690; bh=hjyeAdvFPjYAKCoSVE/6XfFh9s797ggPcA4DXIEnvVo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fh6lTPGVUYqyLM6FJjGEGL9tTjArnzwW11YMJu6GXI30i8qfFOTX9n01rDc2fhCPl Bpf5AKs9CKBcWVKi3xqWFgV2S7xhosixI5dfvd9HRlHZzq5eylo4Krj6HIzI5CULt3 DfiKgyzUdfwyJZy9Eik9SAvvUUz9HxGpAPR1U6wo= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 25 Mar 2020 10:58:03 +0200 Message-Id: <20200325085805.11749-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200325085805.11749-1-laurent.pinchart@ideasonboard.com> References: <20200325085805.11749-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] libcamera: pipeline: Move uvcvideo and vimc to subdirectories X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2020 08:58:11 -0000 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 Reviewed-by: Kieran Bingham --- 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