{"id":20798,"url":"https://patchwork.libcamera.org/api/1.1/patches/20798/?format=json","web_url":"https://patchwork.libcamera.org/patch/20798/","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":"<20240805143654.20870-13-laurent.pinchart@ideasonboard.com>","date":"2024-08-05T14:36:48","name":"[v5,12/18] libcamera: Consolidate tracepoint header in libcamera_internal_headers","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1949b331a0b48ed18a749753e42025055199d942","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/20798/mbox/","series":[{"id":4488,"url":"https://patchwork.libcamera.org/api/1.1/series/4488/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4488","date":"2024-08-05T14:36:36","name":"Split libcamera documentation in public and internal APIs","version":5,"mbox":"https://patchwork.libcamera.org/series/4488/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/20798/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/20798/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 32336C323E\n\tfor ;\n\tMon, 5 Aug 2024 14:37:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 12998633C8;\n\tMon, 5 Aug 2024 16:37:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E917633B5\n\tfor ;\n\tMon, 5 Aug 2024 16:37:34 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D84B0581\n\tfor ;\n\tMon, 5 Aug 2024 16:36:42 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"uhk5lBdx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1722868603;\n\tbh=NC4ukbdD482fvuYs9QTMC0cCYWETUgJ3CaseMtMUgnE=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=uhk5lBdxoyB7Zvy3WYsygfvph62vuQqafxNDDHvgezz9afUNMND5nwaf2xfncP8EW\n\tVKJwqpVS5ouvZcbwt9YrbYal5EiZmxhBEMIFeYM1jwJR462MGeeaJuML2fcgqnEHcN\n\t7VQ/MKsDyH9s1Xn/OKO/ERJ/PeLVJJU9JMAdvcgM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v5 12/18] libcamera: Consolidate tracepoint header in\n\tlibcamera_internal_headers","Date":"Mon, 5 Aug 2024 17:36:48 +0300","Message-ID":"<20240805143654.20870-13-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","In-Reply-To":"<20240805143654.20870-1-laurent.pinchart@ideasonboard.com>","References":"<20240805143654.20870-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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":"The libcamera_tracepoint_header variable stores the tracepoints.h header\ncustom target, for the sole purpose of being listed as a source of the\nlibcamera shared library, through the libcamera_internal_sources\nvariable.\n\nAdd the tracepoints.h header to libcamera_internal_headers instead of\nlibcamera_internal_sources, and list libcamera_internal_headers as a\nsource of the shared library, alongside libcamera_internal_sources. This\nmakes libcamera_internal_sources contain sources only, improving clarity\nof the build system variables.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/internal/meson.build | 16 +++++++++-------\n src/libcamera/meson.build | 2 +-\n 2 files changed, 10 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex f96cc5e37c23..39230facc8a4 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -2,13 +2,6 @@\n \n subdir('tracepoints')\n \n-libcamera_tracepoint_header = custom_target(\n- 'tp_header',\n- input : ['tracepoints.h.in', tracepoint_files],\n- output : 'tracepoints.h',\n- command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],\n-)\n-\n libcamera_internal_headers = files([\n 'bayer_format.h',\n 'byte_stream_buffer.h',\n@@ -51,5 +44,14 @@ libcamera_internal_headers = files([\n 'yaml_parser.h',\n ])\n \n+tracepoints_h = custom_target(\n+ 'tp_header',\n+ input : ['tracepoints.h.in', tracepoint_files],\n+ output : 'tracepoints.h',\n+ command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],\n+)\n+\n+libcamera_internal_headers += tracepoints_h\n+\n subdir('converter')\n subdir('software_isp')\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 86e8b88cc1b2..6a7c9d77dfd8 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -55,7 +55,6 @@ libcamera_internal_sources = files([\n ])\n \n libcamera_public_sources += libcamera_public_headers\n-libcamera_internal_sources += libcamera_tracepoint_header\n \n includes = [\n libcamera_includes,\n@@ -196,6 +195,7 @@ libcamera = shared_library('libcamera',\n [\n libcamera_public_sources,\n libcamera_ipa_headers,\n+ libcamera_internal_headers,\n libcamera_internal_sources,\n ],\n version : libcamera_version,\n","prefixes":["v5","12/18"]}