From patchwork Mon Dec 7 15:07:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10594 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com 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 1FD73BDB20 for ; Mon, 7 Dec 2020 15:07:47 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E2BED67E4E; Mon, 7 Dec 2020 16:07:46 +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="g8G7DY1X"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 223CB67E51 for ; Mon, 7 Dec 2020 16:07:44 +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 956768D; Mon, 7 Dec 2020 16:07:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1607353663; bh=twvfnWI7D11NJkfo1eU2Xx2SflgBrLQMyuGTXrKuVsw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g8G7DY1XtXGLAy3tbrc7GHFYPa7bnV0/TMOEyQyr3VbRkbuv42c1UIePNjgfEFLtu O56Fgf74qCGxUEYCQIudSv/OU1yz2w870Zw+zTP85wxh9W05QMLPzkLYpL8Oczn+8O a/Lj57V3uAjgQGFstV9hkxG5q0SDbjiO1Pxz9ptc= From: Kieran Bingham To: libcamera devel Date: Mon, 7 Dec 2020 15:07:35 +0000 Message-Id: <20201207150737.307692-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207150737.307692-1-kieran.bingham@ideasonboard.com> References: <20201207150737.307692-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/4] 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 8e219943acb8..4b75f05878bc 100644 --- a/src/meson.build +++ b/src/meson.build @@ -21,8 +21,5 @@ subdir('ipa') subdir('cam') subdir('qcam') -if get_option('v4l2') - subdir('v4l2') -endif - subdir('gstreamer') +subdir('v4l2') 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',