Patch Detail
Show a patch.
GET /api/1.1/patches/21356/?format=api
{ "id": 21356, "url": "https://patchwork.libcamera.org/api/1.1/patches/21356/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21356/", "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": "<20240925095850.348259-4-mzamazal@redhat.com>", "date": "2024-09-25T09:58:35", "name": "[v4,03/15] config: Move global configuration to base", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0853dd5924c8fdafbe5f780f83175937ef7a533c", "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/21356/mbox/", "series": [ { "id": 4623, "url": "https://patchwork.libcamera.org/api/1.1/series/4623/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4623", "date": "2024-09-25T09:58:32", "name": "Add global configuration file", "version": 4, "mbox": "https://patchwork.libcamera.org/series/4623/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21356/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21356/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 D4EC1C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 25 Sep 2024 09:59:18 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E0B963518;\n\tWed, 25 Sep 2024 11:59:17 +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 45BF363512\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 25 Sep 2024 11:59:13 +0200 (CEST)", "from mx-prod-mc-05.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-424-VhfNbCo_OHiUbiyck31c-A-1;\n\tWed, 25 Sep 2024 05:59:10 -0400", "from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.12])\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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id C4FFC193EF48; Wed, 25 Sep 2024 09:59:09 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.29])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 51D6319560AA; Wed, 25 Sep 2024 09:59:08 +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=\"epASViUo\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727258352;\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=zYg7vd67vzQoiYWfLK0O1H38pVMNfg5Sl81Jcke2jFg=;\n\tb=epASViUo5Xc45Il7wZ9zhwotwbJNIhFtyJS6/5ci7XtGk0+oz7dT2SRHOodd97tlf11VZ2\n\tYQzDjYWNkMuiFnscVrUfAZdwZ/3AM81jmc0mRlyGeW3MT9juYbnxPEWMoXAKT0lPT03dea\n\tugYWgzuTej6x7IrzoJgpkaj4UkLblsI=", "X-MC-Unique": "VhfNbCo_OHiUbiyck31c-A-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>,\n\tNaushir Patuck <naush@raspberrypi.com>", "Subject": "[PATCH v4 03/15] config: Move global configuration to base", "Date": "Wed, 25 Sep 2024 11:58:35 +0200", "Message-ID": "<20240925095850.348259-4-mzamazal@redhat.com>", "In-Reply-To": "<20240925095850.348259-1-mzamazal@redhat.com>", "References": "<20240925095850.348259-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 10.30.177.12", "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 a742dfdfe..4c0032845 100644\n--- a/src/libcamera/base/meson.build\n+++ b/src/libcamera/base/meson.build\n@@ -16,6 +16,7 @@ libcamera_base_internal_sources = files([\n 'event_dispatcher_poll.cpp',\n 'event_notifier.cpp',\n 'file.cpp',\n+ 'global_configuration.cpp',\n 'log.cpp',\n 'memfd.cpp',\n 'message.cpp',\n@@ -24,10 +25,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 +44,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 520c6c8d3..736cc496f 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -29,7 +29,6 @@ libcamera_internal_sources = files([\n 'device_enumerator_sysfs.cpp',\n 'dma_buf_allocator.cpp',\n 'formats.cpp',\n- 'global_configuration.cpp',\n 'ipa_controls.cpp',\n 'ipa_data_serializer.cpp',\n 'ipa_interface.cpp',\n@@ -52,7 +51,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@@ -80,7 +78,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@@ -116,17 +113,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@@ -186,7 +172,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": [ "v4", "03/15" ] }