{"id":9748,"url":"https://patchwork.libcamera.org/api/patches/9748/?format=json","web_url":"https://patchwork.libcamera.org/patch/9748/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200923143949.310439-3-kieran.bingham@ideasonboard.com>","date":"2020-09-23T14:39:47","name":"[libcamera-devel,v2,2/4] libcamera: Move Header generation utilities to utils","commit_ref":"c09626cd6306239bc473aaf73a2030d5e56699b8","pull_url":null,"state":"accepted","archived":false,"hash":"a24c132ad284f21797c0860fcff2cf53dfefc06f","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9748/mbox/","series":[{"id":1312,"url":"https://patchwork.libcamera.org/api/series/1312/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1312","date":"2020-09-23T14:39:45","name":"Unify utils locations","version":2,"mbox":"https://patchwork.libcamera.org/series/1312/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9748/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9748/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id ADDE8C3B5B\n\tfor ;\n\tWed, 23 Sep 2020 14:39:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 937BB62FF4;\n\tWed, 23 Sep 2020 16:39:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6DEAF62FD2\n\tfor ;\n\tWed, 23 Sep 2020 16:39:54 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EFE09DC4;\n\tWed, 23 Sep 2020 16:39:53 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"nT7/Zp93\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1600871994;\n\tbh=dp88X4/2/GQrVVeTh3R9eymqq3w75Wgl0oxDnkvaSgg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=nT7/Zp93a0O2epKTTRYZmEWpsXzK/hZnfR6cy9GQGhCQwGNfWtbeHKC/fDTAsjBd7\n\tyqBbzAQjRqLlcW0+1jE2MA5eOGTtvRgdepbMV1BN/Ubxy9TNvoBma9PDFQWS3ZZhhV\n\tK7pyFU5sEPwliU2Q7DyIoFsHC7t7HIacinTtbqDg=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Wed, 23 Sep 2020 15:39:47 +0100","Message-Id":"<20200923143949.310439-3-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200923143949.310439-1-kieran.bingham@ideasonboard.com>","References":"<20200923143949.310439-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/4] libcamera: Move Header generation\n\tutilities to utils","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Move the GPL2 utilities which handle generation of controls, formats and\nthe top level libcamera header to the utils subtree.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/meson.build | 6 ------\n src/libcamera/meson.build | 2 --\n {src/libcamera => utils}/gen-controls.py | 0\n {include/libcamera => utils}/gen-formats.py | 0\n {include/libcamera => utils}/gen-header.sh | 0\n utils/meson.build | 5 +++++\n 6 files changed, 5 insertions(+), 8 deletions(-)\n rename {src/libcamera => utils}/gen-controls.py (100%)\n rename {include/libcamera => utils}/gen-formats.py (100%)\n rename {include/libcamera => utils}/gen-header.sh (100%)","diff":"diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex cdb8e0372e77..692931a5a639 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -34,8 +34,6 @@ install_headers(libcamera_public_headers,\n #\n \n # control_ids.h and property_ids.h\n-gen_controls = files('../../src/libcamera/gen-controls.py')\n-\n control_source_files = [\n 'control_ids',\n 'property_ids',\n@@ -57,8 +55,6 @@ endforeach\n libcamera_public_headers += control_headers\n \n # formats.h\n-gen_formats = files('gen-formats.py')\n-\n formats_h = custom_target('formats_h',\n input : files(\n '../../src/libcamera/formats.yaml',\n@@ -72,8 +68,6 @@ formats_h = custom_target('formats_h',\n libcamera_public_headers += formats_h\n \n # libcamera.h\n-gen_header = files('gen-header.sh')\n-\n libcamera_h = custom_target('gen-header',\n input : 'meson.build',\n output : 'libcamera.h',\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 0e6ecf5060a4..d63dacd55cc7 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -77,8 +77,6 @@ if libudev.found()\n ])\n endif\n \n-gen_controls = files('gen-controls.py')\n-\n control_sources = []\n \n foreach source : control_source_files\ndiff --git a/src/libcamera/gen-controls.py b/utils/gen-controls.py\nsimilarity index 100%\nrename from src/libcamera/gen-controls.py\nrename to utils/gen-controls.py\ndiff --git a/include/libcamera/gen-formats.py b/utils/gen-formats.py\nsimilarity index 100%\nrename from include/libcamera/gen-formats.py\nrename to utils/gen-formats.py\ndiff --git a/include/libcamera/gen-header.sh b/utils/gen-header.sh\nsimilarity index 100%\nrename from include/libcamera/gen-header.sh\nrename to utils/gen-header.sh\ndiff --git a/utils/meson.build b/utils/meson.build\nindex c3cd9d69f887..ef5507b1c5ca 100644\n--- a/utils/meson.build\n+++ b/utils/meson.build\n@@ -1,3 +1,8 @@\n # SPDX-License-Identifier: CC0-1.0\n \n subdir('ipu3')\n+\n+## Code generation\n+gen_controls = files('gen-controls.py')\n+gen_formats = files('gen-formats.py')\n+gen_header = files('gen-header.sh')\n","prefixes":["libcamera-devel","v2","2/4"]}