From patchwork Wed Sep 9 13:05:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9553 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 4290FBDB1D for ; Wed, 9 Sep 2020 13:06:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 323AF62D43; Wed, 9 Sep 2020 15:06:07 +0200 (CEST) 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="e5MZT47g"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CAF5462B90 for ; Wed, 9 Sep 2020 15:06:04 +0200 (CEST) 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 6BAA19DF; Wed, 9 Sep 2020 15:06:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1599656764; bh=zD//Ihx1P8BtLeBv2L6EeYx2tMDTcKpdqKdLslwYK0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e5MZT47gdFuvdqIsSPv8as4C48BRHo7fKqR2rCbsCJJjHm91T/J+qaG6DnMtdwjOl 4Ba0iavTDtXms5WdQ5McCM9ndaKSVUYdA7D8Rvjxg8uEyDnom0DtMzhM7KMW+07p9j 8r5fo2vbSrSMuwO0sd0Nih34SCxi94gH1Pcog7JI= From: Kieran Bingham To: libcamera devel Date: Wed, 9 Sep 2020 14:05:58 +0100 Message-Id: <20200909130559.1122914-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> References: <20200909130559.1122914-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] libcamera: Move Header generation utilities to utils 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" Move the GPL2 utilities which handle generation of controls, formats and the top level libcamera header to the utils subtree. Signed-off-by: Kieran Bingham Move the GPL2 utility library out of the libcamera source directory and into the utils subdirectory. Reviewed-by: Laurent Pinchart --- include/libcamera/meson.build | 6 ------ src/libcamera/meson.build | 2 -- {src/libcamera => utils}/gen-controls.py | 0 {include/libcamera => utils}/gen-formats.py | 0 {include/libcamera => utils}/gen-header.sh | 0 utils/meson.build | 9 +++++++++ 6 files changed, 9 insertions(+), 8 deletions(-) rename {src/libcamera => utils}/gen-controls.py (100%) rename {include/libcamera => utils}/gen-formats.py (100%) rename {include/libcamera => utils}/gen-header.sh (100%) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index cdb8e0372e77..692931a5a639 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -34,8 +34,6 @@ install_headers(libcamera_public_headers, # # control_ids.h and property_ids.h -gen_controls = files('../../src/libcamera/gen-controls.py') - control_source_files = [ 'control_ids', 'property_ids', @@ -57,8 +55,6 @@ endforeach libcamera_public_headers += control_headers # formats.h -gen_formats = files('gen-formats.py') - formats_h = custom_target('formats_h', input : files( '../../src/libcamera/formats.yaml', @@ -72,8 +68,6 @@ formats_h = custom_target('formats_h', libcamera_public_headers += formats_h # libcamera.h -gen_header = files('gen-header.sh') - libcamera_h = custom_target('gen-header', input : 'meson.build', output : 'libcamera.h', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index af2f3d950be6..d54ee979418b 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -77,8 +77,6 @@ if libudev.found() ]) endif -gen_controls = files('gen-controls.py') - control_sources = [] foreach source : control_source_files diff --git a/src/libcamera/gen-controls.py b/utils/gen-controls.py similarity index 100% rename from src/libcamera/gen-controls.py rename to utils/gen-controls.py diff --git a/include/libcamera/gen-formats.py b/utils/gen-formats.py similarity index 100% rename from include/libcamera/gen-formats.py rename to utils/gen-formats.py diff --git a/include/libcamera/gen-header.sh b/utils/gen-header.sh similarity index 100% rename from include/libcamera/gen-header.sh rename to utils/gen-header.sh diff --git a/utils/meson.build b/utils/meson.build index c3cd9d69f887..7689790eb1c1 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,3 +1,12 @@ # SPDX-License-Identifier: CC0-1.0 subdir('ipu3') + +## Generates control_ids.h and property_ids.h +gen_controls = files('gen-controls.py') + +## Generates formats.h +gen_formats = files('gen-formats.py') + +## Generates libcamera.h +gen_header = files('gen-header.sh')