{"id":23564,"url":"https://patchwork.libcamera.org/api/1.1/patches/23564/?format=json","web_url":"https://patchwork.libcamera.org/patch/23564/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20250616084733.18707-2-mzamazal@redhat.com>","date":"2025-06-16T08:47:19","name":"[v10,01/13] yaml: Move yaml_parser.cpp to base","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b807d689b0ff81c496988fc71695a2602e22161e","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23564/mbox/","series":[{"id":5220,"url":"https://patchwork.libcamera.org/api/1.1/series/5220/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5220","date":"2025-06-16T08:47:18","name":"Add global configuration file","version":10,"mbox":"https://patchwork.libcamera.org/series/5220/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23564/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23564/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 97B02C3237\n\tfor ;\n\tMon, 16 Jun 2025 08:47:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 517CD68DC0;\n\tMon, 16 Jun 2025 10:47:52 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D9A8468DB4\n\tfor ;\n\tMon, 16 Jun 2025 10:47:50 +0200 (CEST)","from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-159-9uGdd109OCO-3NHrTfLb1g-1;\n\tMon, 16 Jun 2025 04:47:47 -0400","from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id EAA24195608A; Mon, 16 Jun 2025 08:47:45 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.226.135])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7278B1956094; Mon, 16 Jun 2025 08:47:42 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"AVV9QP/5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1750063669;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=IJLfQVHEXaumvo+gfPnw73YRBbctGrbT7PW9PKMHD48=;\n\tb=AVV9QP/5o7SUXn8zeWlP6t5wl29tXeO6HOvEezyQ0cIO6B3cXuUXEAWyBKRb4NynDbOH32\n\tyObRS1Ze8/2nif5DWFhSKAvJEYEIbqpPYpRcjjZks/HQDZvQM7Gjf4fc35PdcOeaLKWy+f\n\tXsXWJYR9KJgaBRalSBvFuFYG1MT6HvI=","X-MC-Unique":"9uGdd109OCO-3NHrTfLb1g-1","X-Mimecast-MFC-AGG-ID":"9uGdd109OCO-3NHrTfLb1g_1750063666","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal , Kieran Bingham\n\t, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t, Laurent Pinchart\n\t","Subject":"[PATCH v10 01/13] yaml: Move yaml_parser.cpp to base","Date":"Mon, 16 Jun 2025 10:47:19 +0200","Message-ID":"<20250616084733.18707-2-mzamazal@redhat.com>","In-Reply-To":"<20250616084733.18707-1-mzamazal@redhat.com>","References":"<20250616084733.18707-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.15","X-Mimecast-Spam-Score":"0","X-Mimecast-MFC-PROC-ID":"V0Erwvrco_gsE5mZUqcT2fnGM8gkz3ooEUXpk1BuI6I_1750063666","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","content-type":"text/plain; charset=\"US-ASCII\"; x-default=true","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":"Global configuration, which uses objects from the YAML parser, will be\naccessed from base. Thus YAML parser must be moved to base too.\n\nIndentation is changed in one place of the moved file to make the\nautoformatter and checkstyle.py happy.\n\nSigned-off-by: Milan Zamazal \nReviewed-by: Kieran Bingham \nSigned-off-by: Milan Zamazal \n---\n src/libcamera/base/meson.build | 14 ++++++++++++++\n src/libcamera/{ => base}/yaml_parser.cpp | 13 ++++++-------\n src/libcamera/meson.build | 14 --------------\n 3 files changed, 20 insertions(+), 21 deletions(-)\n rename src/libcamera/{ => base}/yaml_parser.cpp (98%)","diff":"diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build\nindex a742dfdfe..94843eb95 100644\n--- a/src/libcamera/base/meson.build\n+++ b/src/libcamera/base/meson.build\n@@ -24,10 +24,12 @@ libcamera_base_internal_sources = files([\n 'thread.cpp',\n 'timer.cpp',\n 'utils.cpp',\n+ 'yaml_parser.cpp',\n ])\n \n libdw = dependency('libdw', required : false)\n libunwind = dependency('libunwind', required : false)\n+libyaml = dependency('yaml-0.1', required : false)\n \n if cc.has_header_symbol('execinfo.h', 'backtrace')\n config_h.set('HAVE_BACKTRACE', 1)\n@@ -41,11 +43,23 @@ if libunwind.found()\n config_h.set('HAVE_UNWIND', 1)\n endif\n \n+# Fallback to a subproject if libyaml isn't found, as it's not packaged in AOSP.\n+if not libyaml.found()\n+ cmake = import('cmake')\n+\n+ libyaml_vars = cmake.subproject_options()\n+ libyaml_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})\n+ libyaml_vars.append_compile_args('c', '-Wno-unused-value')\n+ libyaml_wrap = cmake.subproject('libyaml', options : libyaml_vars)\n+ libyaml = libyaml_wrap.dependency('yaml')\n+endif\n+\n libcamera_base_deps = [\n libatomic,\n libdw,\n libthreads,\n libunwind,\n+ libyaml,\n ]\n \n # Internal components must use the libcamera_base_private dependency to enable\ndiff --git a/src/libcamera/yaml_parser.cpp b/src/libcamera/base/yaml_parser.cpp\nsimilarity index 98%\nrename from src/libcamera/yaml_parser.cpp\nrename to src/libcamera/base/yaml_parser.cpp\nindex a5e424615..13111faaa 100644\n--- a/src/libcamera/yaml_parser.cpp\n+++ b/src/libcamera/base/yaml_parser.cpp\n@@ -149,13 +149,12 @@ YamlObject::Getter::get(const YamlObject &obj) const\n \n template\n struct YamlObject::Getter ||\n-\tstd::is_same_v ||\n-\tstd::is_same_v ||\n-\tstd::is_same_v ||\n-\tstd::is_same_v ||\n-\tstd::is_same_v>>\n-{\n+\t\t\t\t std::is_same_v ||\n+\t\t\t\t std::is_same_v ||\n+\t\t\t\t std::is_same_v ||\n+\t\t\t\t std::is_same_v ||\n+\t\t\t\t std::is_same_v ||\n+\t\t\t\t std::is_same_v>> {\n \tstd::optional get(const YamlObject &obj) const\n \t{\n \t\tif (obj.type_ != Type::Value)\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 202db1efe..24fcfcf57 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -55,7 +55,6 @@ libcamera_internal_sources = files([\n 'v4l2_subdevice.cpp',\n 'v4l2_videodevice.cpp',\n 'vector.cpp',\n- 'yaml_parser.cpp',\n ])\n \n includes = [\n@@ -83,7 +82,6 @@ if not cc.has_function('dlopen')\n libdl = cc.find_library('dl')\n endif\n libudev = dependency('libudev', required : get_option('udev'))\n-libyaml = dependency('yaml-0.1', required : false)\n \n # Use one of gnutls or libcrypto (provided by OpenSSL), trying gnutls first.\n libcrypto = dependency('gnutls', required : false)\n@@ -119,17 +117,6 @@ if libudev.found()\n ])\n endif\n \n-# Fallback to a subproject if libyaml isn't found, as it's not packaged in AOSP.\n-if not libyaml.found()\n- cmake = import('cmake')\n-\n- libyaml_vars = cmake.subproject_options()\n- libyaml_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'})\n- libyaml_vars.append_compile_args('c', '-Wno-unused-value')\n- libyaml_wrap = cmake.subproject('libyaml', options : libyaml_vars)\n- libyaml = libyaml_wrap.dependency('yaml')\n-endif\n-\n control_sources = []\n \n controls_mode_files = {\n@@ -190,7 +177,6 @@ libcamera_deps += [\n libdl,\n liblttng,\n libudev,\n- libyaml,\n ]\n \n # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n","prefixes":["v10","01/13"]}