{"id":20852,"url":"https://patchwork.libcamera.org/api/patches/20852/?format=json","web_url":"https://patchwork.libcamera.org/patch/20852/","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":"<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","date":"2024-08-09T00:59:06","name":"[02/10] meson: Fix mismatch in controls and properties generated file names","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"522aaa7059f77bbf295f7cde082db1a7b58097aa","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20852/mbox/","series":[{"id":4506,"url":"https://patchwork.libcamera.org/api/series/4506/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4506","date":"2024-08-09T00:59:04","name":"libcamera: Improve code generation for controls","version":1,"mbox":"https://patchwork.libcamera.org/series/4506/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20852/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20852/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 C8596BE173\n\tfor ;\n\tFri, 9 Aug 2024 00:59:47 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4049E633C1;\n\tFri, 9 Aug 2024 02:59:46 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1FE62633B5\n\tfor ;\n\tFri, 9 Aug 2024 02:59:42 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F214083F\n\tfor ;\n\tFri, 9 Aug 2024 02:58:47 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"UYS45QSx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1723165128;\n\tbh=jd2QQBhLPPfiGPBnMr+g2I5+IpA7OOjgA4P7Kq/+tcM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=UYS45QSxfRaVKN/kML4ZBhmpqqKMATQkAW0nQwx/CHkMv0cz9wCRPL7raAj49XSln\n\teo2IKH61y9K78KedskQn5LFui4XWqtfGJrliE7jrtYmFh0Q8K4JvDgDxjff2I8Rxl+\n\tLt+1B/DXmX3wrBLbZujPK2/eG656LSG+A3Dd3dYs=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH 02/10] meson: Fix mismatch in controls and properties\n\tgenerated file names","Date":"Fri, 9 Aug 2024 03:59:06 +0300","Message-ID":"<20240809005914.20662-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","In-Reply-To":"<20240809005914.20662-1-laurent.pinchart@ideasonboard.com>","References":"<20240809005914.20662-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The header for controls and properties are generated from the\ncontrol_ids.h.in and property_ids.h.in templates respectively, and the\ngenerated files are named control_ids.h and property_ids.h.\n\nFor sources, the templates are named control_ids.cpp.in and\nproperty_ids.cpp.in, but the output files are named controls_ids.cpp and\nproperties_ids.cpp. This discrepancy causes confusion. Fix it.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/meson.build | 22 +++++++++++++---------\n 1 file changed, 13 insertions(+), 9 deletions(-)","diff":"diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 79b8cbaf1311..e5e959d9c7bd 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -129,21 +129,25 @@ endif\n control_sources = []\n \n controls_mode_files = {\n- 'controls' : controls_files,\n- 'properties' : properties_files,\n+ 'controls': [\n+ controls_files,\n+ 'control_ids.cpp',\n+ ],\n+ 'properties': [\n+ properties_files,\n+ 'property_ids.cpp',\n+ ],\n }\n \n-foreach mode, input_files : controls_mode_files\n- if mode == 'controls'\n- template_file = files('control_ids.cpp.in')\n- else\n- template_file = files('property_ids.cpp.in')\n- endif\n+foreach mode, inout_files : controls_mode_files\n+ input_files = inout_files[0]\n+ output_file = inout_files[1]\n \n+ template_file = files(output_file + '.in')\n ranges_file = files('control_ranges.yaml')\n control_sources += custom_target(mode + '_cpp',\n input : input_files,\n- output : mode + '_ids.cpp',\n+ output : output_file,\n command : [gen_controls, '-o', '@OUTPUT@',\n '--mode', mode, '-t', template_file,\n '-r', ranges_file, '@INPUT@'])\n","prefixes":["02/10"]}