Patch Detail
Show a patch.
GET /api/patches/22747/?format=api
{ "id": 22747, "url": "https://patchwork.libcamera.org/api/patches/22747/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22747/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20250206161607.50738-2-mzamazal@redhat.com>", "date": "2025-02-06T16:15:52", "name": "[v7,01/15] yaml: Move yaml_parser.cpp to base", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "16f3b06e6cb32e9d4af5555efa268d0ccab821f4", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22747/mbox/", "series": [ { "id": 4993, "url": "https://patchwork.libcamera.org/api/series/4993/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4993", "date": "2025-02-06T16:15:51", "name": "Add global configuration file", "version": 7, "mbox": "https://patchwork.libcamera.org/series/4993/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22747/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22747/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 76F6AC32EF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 6 Feb 2025 16:16:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 366EE685EB;\n\tThu, 6 Feb 2025 17:16:26 +0100 (CET)", "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 4519F685E2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Feb 2025 17:16:23 +0100 (CET)", "from mx-prod-mc-04.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-59-9lzlyDb8MRS7APu50aogsA-1;\n\tThu, 06 Feb 2025 11:16:20 -0500", "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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 5AE7D1955D63; Thu, 6 Feb 2025 16:16:19 +0000 (UTC)", "from mzamazal-thinkpadp1gen3.tpbc.com (unknown [10.43.17.31])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 2C116180035E; Thu, 6 Feb 2025 16:16:16 +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=\"ZhBVUX1k\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1738858582;\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=WxFIVXVVfrtAQxxqseK7jA86EHcOiqdq3NDpDLZc52I=;\n\tb=ZhBVUX1keSvOPWGRgEsEP2RQgiS2edSYxSfNKVwdmw00q3h+PjjCOm9isTPZA+k/ZnLsHP\n\tEOfFp85uypj/cCYxbLIqCyLrSuxIAWQkuLgyY9FWMtROCVblKnxF089y0LfA+PCEn1OyqE\n\tWDjMIxHplgF973bxVyx8CsJafI1glIQ=", "X-MC-Unique": "9lzlyDb8MRS7APu50aogsA-1", "X-Mimecast-MFC-AGG-ID": "9lzlyDb8MRS7APu50aogsA", "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>, Naushir Patuck\n\t<naush@raspberrypi.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 v7 01/15] yaml: Move yaml_parser.cpp to base", "Date": "Thu, 6 Feb 2025 17:15:52 +0100", "Message-ID": "<20250206161607.50738-2-mzamazal@redhat.com>", "In-Reply-To": "<20250206161607.50738-1-mzamazal@redhat.com>", "References": "<20250206161607.50738-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": "jE-gSh6Vd_s_5H42m8n24g8e5aCgibGPbfUlnWE4mkM_1738858579", "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 57fde8a8..c2d112a9 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -53,7 +53,6 @@ libcamera_internal_sources = files([\n 'v4l2_pixelformat.cpp',\n 'v4l2_subdevice.cpp',\n 'v4l2_videodevice.cpp',\n- 'yaml_parser.cpp',\n ])\n \n includes = [\n@@ -81,7 +80,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@@ -117,17 +115,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@@ -187,7 +174,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": [ "v7", "01/15" ] }