Patch Detail
Show a patch.
GET /api/1.1/patches/23309/?format=api
{ "id": 23309, "url": "https://patchwork.libcamera.org/api/1.1/patches/23309/?format=api", "web_url": "https://patchwork.libcamera.org/patch/23309/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250430121449.39910-2-mzamazal@redhat.com>", "date": "2025-04-30T12:14:34", "name": "[v8,01/15] 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=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/23309/mbox/", "series": [ { "id": 5156, "url": "https://patchwork.libcamera.org/api/1.1/series/5156/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5156", "date": "2025-04-30T12:14:33", "name": "Add global configuration file", "version": 8, "mbox": "https://patchwork.libcamera.org/series/5156/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/23309/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/23309/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 96AA4BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 30 Apr 2025 12:15:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5179068AD8;\n\tWed, 30 Apr 2025 14:15:06 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AA49068ADB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 30 Apr 2025 14:15:03 +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-332-r2fsM4BEPny_lhqXHQfADQ-1;\n\tWed, 30 Apr 2025 08:15:01 -0400", "from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.111])\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 A673A19560A0; Wed, 30 Apr 2025 12:14:59 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.44.32.120])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id E3BF718001D5; Wed, 30 Apr 2025 12:14:57 +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=\"bq/jO3bR\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1746015302;\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=6nojKMgyAr1J7Kg+cw5+5LA/MAeA+yK1yKIX+m6UGFQ=;\n\tb=bq/jO3bRMdA7EkzEVG3Htgvw/WmVPg8Vb0rwOvz6bay42l+8V6gY1V9L78TMnt8mRzOhE6\n\tLdkdZFjvgQYn7vtDN8lFW7QlG8aZTVNEAC322hDI0YdEuH53iLK2xCn7wTa8lkov9uOnNB\n\tzUKLoRxVhkgi9EYFWrYLWk489TTlS7Q=", "X-MC-Unique": "r2fsM4BEPny_lhqXHQfADQ-1", "X-Mimecast-MFC-AGG-ID": "r2fsM4BEPny_lhqXHQfADQ_1746015299", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<pobrn@protonmail.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v8 01/15] yaml: Move yaml_parser.cpp to base", "Date": "Wed, 30 Apr 2025 14:14:34 +0200", "Message-ID": "<20250430121449.39910-2-mzamazal@redhat.com>", "In-Reply-To": "<20250430121449.39910-1-mzamazal@redhat.com>", "References": "<20250430121449.39910-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.111", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "_aO8puuxZZ6wIPZ2PnxSXytIhP8VhRDkb2y9r-7oK9o_1746015299", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Global configuration, which uses the YAML parser, will be in base. Thus\nYAML 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 <mzamazal@redhat.com>\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 a742dfdf..94843eb9 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 a5e42461..13111faa 100644\n--- a/src/libcamera/yaml_parser.cpp\n+++ b/src/libcamera/base/yaml_parser.cpp\n@@ -149,13 +149,12 @@ YamlObject::Getter<bool>::get(const YamlObject &obj) const\n \n template<typename T>\n struct YamlObject::Getter<T, std::enable_if_t<\n-\tstd::is_same_v<int8_t, T> ||\n-\tstd::is_same_v<uint8_t, T> ||\n-\tstd::is_same_v<int16_t, T> ||\n-\tstd::is_same_v<uint16_t, T> ||\n-\tstd::is_same_v<int32_t, T> ||\n-\tstd::is_same_v<uint32_t, T>>>\n-{\n+\t\t\t\t std::is_same_v<int8_t, T> ||\n+\t\t\t\t std::is_same_v<uint8_t, T> ||\n+\t\t\t\t std::is_same_v<int16_t, T> ||\n+\t\t\t\t std::is_same_v<uint16_t, T> ||\n+\t\t\t\t std::is_same_v<int32_t, T> ||\n+\t\t\t\t std::is_same_v<uint32_t, T>>> {\n \tstd::optional<T> 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 800d4080..e3f382fa 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@@ -189,7 +176,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": [ "v8", "01/15" ] }