Patch Detail
Show a patch.
GET /api/1.1/patches/19918/?format=api
{ "id": 19918, "url": "https://patchwork.libcamera.org/api/1.1/patches/19918/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19918/", "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": "<20240423103034.364150-3-mzamazal@redhat.com>", "date": "2024-04-23T10:30:17", "name": "[v2,02/13] 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/19918/mbox/", "series": [ { "id": 4267, "url": "https://patchwork.libcamera.org/api/1.1/series/4267/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4267", "date": "2024-04-23T10:30:15", "name": "Add global configuration file", "version": 2, "mbox": "https://patchwork.libcamera.org/series/4267/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19918/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19918/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 9BF5AC328D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Apr 2024 10:31:25 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3893E63418;\n\tTue, 23 Apr 2024 12:31:25 +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 4D2EF633ED\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Apr 2024 12:31:22 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-183-HdVQbnICMvmrGACv-amdfw-1; Tue, 23 Apr 2024 06:31:17 -0400", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 824AC830E85;\n\tTue, 23 Apr 2024 10:31:17 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.63])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 8563D1C060D0;\n\tTue, 23 Apr 2024 10:31: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=\"iAiWinFJ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1713868281;\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=woetzTY+HtEPtYJuEWfHtgLTZIgN8sOVk3SAn00PD3Y=;\n\tb=iAiWinFJLFSnljzcEN4gjg2qwkRfIhJgvwXsz0OCESB9x9xae91BO46FGKNLWxrSqHbbxB\n\tEUvAYSsqLvBn8FcTqeYaZSqMaYy8VIpUl7Is43ujo2XrAAcjTIItpJCnQ81qiaEAoqUk8v\n\t4E8CnnIAjXWxogv0ukdT8YD073mYDk8=", "X-MC-Unique": "HdVQbnICMvmrGACv-amdfw-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>,\n\tNaushir Patuck <naush@raspberrypi.com>", "Subject": "[PATCH v2 02/13] config: Move global configuration to base", "Date": "Tue, 23 Apr 2024 12:30:17 +0200", "Message-ID": "<20240423103034.364150-3-mzamazal@redhat.com>", "In-Reply-To": "<20240423103034.364150-1-mzamazal@redhat.com>", "References": "<20240423103034.364150-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.7", "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 b81c75b8..fb1ce3fc 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": [ "v2", "02/13" ] }