Patch Detail
Show a patch.
GET /api/1.1/patches/20437/?format=api
{ "id": 20437, "url": "https://patchwork.libcamera.org/api/1.1/patches/20437/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20437/", "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": "<20240627145156.1094127-3-mzamazal@redhat.com>", "date": "2024-06-27T14:51:39", "name": "[v3,02/14] config: Move global configuration to base", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "ede0e7714e9c7a4cfae7a3e5d66940ed2046bdb4", "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/20437/mbox/", "series": [ { "id": 4426, "url": "https://patchwork.libcamera.org/api/1.1/series/4426/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4426", "date": "2024-06-27T14:51:37", "name": "Add global configuration file", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4426/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20437/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20437/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 ABE81BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 27 Jun 2024 14:52:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 75D2E62C9D;\n\tThu, 27 Jun 2024 16:52:38 +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 440B5619E8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 27 Jun 2024 16:52:36 +0200 (CEST)", "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-637-X7Il_5HbPKSfTMGKOwDSww-1;\n\tThu, 27 Jun 2024 10:52:34 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id E5DBB19560B1; Thu, 27 Jun 2024 14:52:32 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.47])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7820C1955BE0; Thu, 27 Jun 2024 14:52:31 +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=\"XGbLdGBh\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1719499955;\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=BZG0gaLQt60ZzZpv5RpQ8pBioEWeEkUn+Iay+YBkB6A=;\n\tb=XGbLdGBhgawrBQ/yrtZIzFAYy1R95yA9yNRakdKyB40hoXtv4VweXxlADVQjIwWWSxGGzn\n\tIFT5Xpexmc7V+ng/qk9iwkTQoR5e5TrEkwaQNmJuUDxfrmCQ88CkctSnUcKmrNFtWKpx9k\n\tCmEu7EQmxDI3csAWemEzgLWh7gmprsk=", "X-MC-Unique": "X7Il_5HbPKSfTMGKOwDSww-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>", "Subject": "[PATCH v3 02/14] config: Move global configuration to base", "Date": "Thu, 27 Jun 2024 16:51:39 +0200", "Message-ID": "<20240627145156.1094127-3-mzamazal@redhat.com>", "In-Reply-To": "<20240627145156.1094127-1-mzamazal@redhat.com>", "References": "<20240627145156.1094127-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-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 may be used by some components from base, most\nnotably logging. This means the configuration must also be present in\nbase. And YAML object and parsing too. Let's move that all there.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n src/libcamera/{ => base}/global_configuration.cpp | 0\n src/libcamera/base/meson.build | 15 +++++++++++++++\n src/libcamera/{ => base}/yaml_parser.cpp | 0\n src/libcamera/meson.build | 15 ---------------\n 4 files changed, 15 insertions(+), 15 deletions(-)\n rename src/libcamera/{ => base}/global_configuration.cpp (100%)\n rename src/libcamera/{ => base}/yaml_parser.cpp (100%)", "diff": "diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nsimilarity index 100%\nrename from src/libcamera/global_configuration.cpp\nrename to src/libcamera/base/global_configuration.cpp\ndiff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build\nindex 7a7fd7e4..b71d3e23 100644\n--- a/src/libcamera/base/meson.build\n+++ b/src/libcamera/base/meson.build\n@@ -9,6 +9,7 @@ libcamera_base_sources = files([\n 'event_notifier.cpp',\n 'file.cpp',\n 'flags.cpp',\n+ 'global_configuration.cpp',\n 'log.cpp',\n 'message.cpp',\n 'mutex.cpp',\n@@ -20,10 +21,12 @@ libcamera_base_sources = files([\n 'timer.cpp',\n 'unique_fd.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@@ -37,11 +40,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 100%\nrename from src/libcamera/yaml_parser.cpp\nrename to src/libcamera/base/yaml_parser.cpp\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 32396ff2..1bee980c 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -21,7 +21,6 @@ libcamera_sources = files([\n 'framebuffer.cpp',\n 'framebuffer_allocator.cpp',\n 'geometry.cpp',\n- 'global_configuration.cpp',\n 'ipa_controls.cpp',\n 'ipa_data_serializer.cpp',\n 'ipa_interface.cpp',\n@@ -49,7 +48,6 @@ libcamera_sources = files([\n 'v4l2_pixelformat.cpp',\n 'v4l2_subdevice.cpp',\n 'v4l2_videodevice.cpp',\n- 'yaml_parser.cpp',\n ])\n \n libcamera_sources += libcamera_public_headers\n@@ -81,7 +79,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 +114,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@@ -183,7 +169,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": [ "v3", "02/14" ] }