{"id":19803,"url":"https://patchwork.libcamera.org/api/1.1/patches/19803/?format=json","web_url":"https://patchwork.libcamera.org/patch/19803/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240326112419.503286-3-mzamazal@redhat.com>","date":"2024-03-26T11:24:05","name":"[RFC,02/11] 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=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19803/mbox/","series":[{"id":4241,"url":"https://patchwork.libcamera.org/api/1.1/series/4241/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4241","date":"2024-03-26T11:24:03","name":"Add global configuration file","version":1,"mbox":"https://patchwork.libcamera.org/series/4241/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19803/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19803/checks/","tags":{},"headers":{"Return-Path":"","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 68A31BD160\n\tfor ;\n\tTue, 26 Mar 2024 11:26:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1939963334;\n\tTue, 26 Mar 2024 12:26:21 +0100 (CET)","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 69D4A63037\n\tfor ;\n\tTue, 26 Mar 2024 12:26:19 +0100 (CET)","from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-292-wQPZS5yUPdOkn9aWpdD-yA-1;\n\tTue, 26 Mar 2024 07:26:16 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 4FA633C0D7B7\n\tfor ;\n\tTue, 26 Mar 2024 11:26:16 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D2C313C54;\n\tTue, 26 Mar 2024 11:26:15 +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=\"PkY9D7Ws\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1711452378;\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=Br90tOxDYLy2ge9WS76qMTdULqiTbJc5OrIYbqwZJbM=;\n\tb=PkY9D7Wsqda6HFSlUJCRG4/fwxhtIjUXVkL09iecPdB1pHrtQMz+gW2C9fmR0NvSqQte+Y\n\tA6S2Lkjz7eQrGMSm9C3tFYGB+1R6rxFBRgPg7mrF7cceq1PlFs7FIuIkNCsWKf9EcSYPnt\n\tNcX4Wsz66H5mFthCXD1a5Nelc/S0sZY=","X-MC-Unique":"wQPZS5yUPdOkn9aWpdD-yA-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","Subject":"[RFC PATCH 02/11] config: Move global configuration to base","Date":"Tue, 26 Mar 2024 12:24:05 +0100","Message-ID":"<20240326112419.503286-3-mzamazal@redhat.com>","In-Reply-To":"<20240326112419.503286-1-mzamazal@redhat.com>","References":"<20240326112419.503286-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.1","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Global configuration may be used by some components from base, most notably\nlogging. This means the configuration must also be present in base. And YAML\nobject and parsing too. Let's move it all there.\n\nSigned-off-by: Milan Zamazal \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":["RFC","02/11"]}