From patchwork Mon Nov 23 16:43:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10474 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 7658ABE08A for ; Mon, 23 Nov 2020 16:45:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 43FCD633FB; Mon, 23 Nov 2020 17:45:03 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Q5v1YVDJ"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F0FD0633F6 for ; Mon, 23 Nov 2020 17:44:58 +0100 (CET) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8427871; Mon, 23 Nov 2020 17:44:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1606149898; bh=aBox++raUvo2sW/mFpOTME+Qelppss6T2peHGVCvfT4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q5v1YVDJFcRvngap79AqmXdyREGXdLqeb51hu8x6kBE4nYlXl2MwCQY6lg/lqzZcy AuoLCIMTN7Rp96VP6+gAkHKZ/9wRXewt6/LJa+IWZvu5m+RvsdQ05N/Z9lpfD7Km7B wUYOxaLJ6PrFiplbguDUJzrE6oYPudZUKrprF/30= From: Kieran Bingham To: libcamera devel Date: Mon, 23 Nov 2020 16:43:14 +0000 Message-Id: <20201123164319.152742-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> References: <20201123164319.152742-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 3/8] src: meson: Simplify v4l2 enablement 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Simplify the src level meson file by moving the declaration of the v4l2 subdir to match the other invocations, making use of 'subdir_done()' to break out if the adaptation layer is not enabled. Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi Reviewed-by: Laurent Pinchart --- src/meson.build | 5 +---- src/v4l2/meson.build | 4 ++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index 27f70544f1f6..8c7449f9b8a0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -20,8 +20,5 @@ subdir('ipa') subdir('cam') subdir('qcam') -if get_option('v4l2') - subdir('v4l2') -endif - +subdir('v4l2') subdir('gstreamer') diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index e3838f0b07cc..dbe6a424b10e 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -1,5 +1,9 @@ # SPDX-License-Identifier: CC0-1.0 +if not get_option('v4l2') + subdir_done() +endif + v4l2_compat_sources = files([ 'v4l2_camera.cpp', 'v4l2_camera_file.cpp',