{"id":14521,"url":"https://patchwork.libcamera.org/api/1.1/patches/14521/?format=json","web_url":"https://patchwork.libcamera.org/patch/14521/","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":"<20210929094148.1965-3-laurent.pinchart@ideasonboard.com>","date":"2021-09-29T09:41:48","name":"[libcamera-devel,v2,2/2] libcamera: Simplify header install paths with shortcut variables","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7704d77ae4e92f344a88b922739eb624bcba5e33","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/14521/mbox/","series":[{"id":2585,"url":"https://patchwork.libcamera.org/api/1.1/series/2585/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2585","date":"2021-09-29T09:41:46","name":"libcamera: Fix header install paths","version":2,"mbox":"https://patchwork.libcamera.org/series/2585/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14521/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14521/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":["parsemail@patchwork.libcamera.org","kbingham@ideasonboard.com"],"Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 031C7BF415\n\tfor ;\n\tWed, 10 Nov 2021 13:58:11 +0000 (UTC)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 90903501\n\tfor ;\n\tWed, 10 Nov 2021 14:58:11 +0100 (CET)","from perceval.ideasonboard.com\n\tby perceval.ideasonboard.com with LMTP id SP2JCOs0VGElOQAA4E0KoQ\n\t(envelope-from )\n\tfor ; Wed, 29 Sep 2021 11:42:03 +0200","from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\tby perceval.ideasonboard.com (Postfix) with ESMTPS\n\tid 0CC153F0;\tWed, 29 Sep 2021 11:42:03 +0200 (CEST)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BAF38691AF;\n\tWed, 29 Sep 2021 11:42:02 +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 E58646919D\n\tfor ;\n\tWed, 29 Sep 2021 11:41:57 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 805893F0\n\tfor ;\n\tWed, 29 Sep 2021 11:41:57 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1636552691;\n\tbh=qR7YqITat2c/d1YZVSh7KAw6dKVM6bqAzgAVMCTy7pA=;\n\th=From:To:Date:In-Reply-To:References:Subject:List-Id:\n\tList-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe:\n\tResent-From:Resent-To:From;\n\tb=bCeeIPedWcx0564SpscdyZd+QHE2XUOOBZhybciMtNdxnHI5CYT7pru/XLdkFWeJl\n\tRtUs1fjSw7T9wConMosDPMlSX8yXguSO9aLHlFV9q2fjHQpzm+4wAIyT50KwspkZjW\n\t/GtrtG1Td9o8aas39VUlOXY7a6/36GAakbv2Mu98=","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1632908517;\n\tbh=qR7YqITat2c/d1YZVSh7KAw6dKVM6bqAzgAVMCTy7pA=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=PmEpClXIIeFfRDjyw0yzUHsEkEd4ZKPfsH75vha7y4irvV4VBXU97TQfsjB15+GGE\n\tsXIPVZk7+zPGqxj/xKJJ2Ls85Ri6HBaFCpL15du5UtqzYojH3RxldlkAMoIRC4Ca5F\n\tJtB3hB6bsh9q9p+plHH5cMxI7ubGjee/mpIgONmE="],"Authentication-Results":["perceval.ideasonboard.com;\n\tdkim=fail reason=\"signature\n\tverification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com header.b=\"PmEpClXI\";\tdkim-atps=neutral","lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature\n\tverification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com header.b=\"PmEpClXI\";\tdkim-atps=neutral"],"From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 29 Sep 2021 12:41:48 +0300","Message-Id":"<20210929094148.1965-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210929094148.1965-1-laurent.pinchart@ideasonboard.com>","References":"<20210929094148.1965-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/2] libcamera: Simplify header install\n\tpaths with shortcut variables","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\" ","X-TUID":"mwJM3SiLd+9t","Resent-From":"Kieran Bingham ","Resent-To":"parsemail@patchwork.libcamera.org"},"content":"Create local install_dir meson variable to store the full path to the\ninstallation directory for the libcamera and ipa headers. This shortens\nlines and avoids duplicating calls to get_option('includedir').\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\nChanges since v1:\n\n- Rename install_dir\n---\n include/libcamera/ipa/meson.build | 6 ++++--\n include/libcamera/meson.build | 10 ++++++----\n 2 files changed, 10 insertions(+), 6 deletions(-)","diff":"diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex 81fb69f0b681..6ea94fb53f43 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -13,6 +13,8 @@ install_headers(libcamera_ipa_headers,\n \n libcamera_generated_ipa_headers = []\n \n+ipa_headers_install_dir = get_option('includedir') / libcamera_ipa_include_dir\n+\n #\n # Prepare IPA/IPC generation components\n #\n@@ -34,7 +36,7 @@ libcamera_generated_ipa_headers += custom_target('core_ipa_interface_h',\n output : 'core_ipa_interface.h',\n depends : mojom_templates,\n install : true,\n- install_dir : get_option('includedir') / libcamera_ipa_include_dir,\n+ install_dir : ipa_headers_install_dir,\n command : [\n mojom_generator, 'generate',\n '-g', 'libcamera',\n@@ -98,7 +100,7 @@ foreach file : ipa_mojom_files\n output : name + '_ipa_interface.h',\n depends : mojom_templates,\n install : true,\n- install_dir : get_option('includedir') / libcamera_ipa_include_dir,\n+ install_dir : ipa_headers_install_dir,\n command : [\n mojom_generator, 'generate',\n '-g', 'libcamera',\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex 567782a66ba3..7155ff203f6e 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -29,6 +29,8 @@ install_headers(libcamera_public_headers,\n # Generate headers from templates.\n #\n \n+libcamera_headers_install_dir = get_option('includedir') / libcamera_include_dir\n+\n # control_ids.h and property_ids.h\n control_source_files = [\n 'control_ids',\n@@ -44,7 +46,7 @@ foreach header : control_source_files\n output : header + '.h',\n command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],\n install : true,\n- install_dir : get_option('includedir') / libcamera_include_dir)\n+ install_dir : libcamera_headers_install_dir)\n endforeach\n \n libcamera_public_headers += control_headers\n@@ -59,7 +61,7 @@ formats_h = custom_target('formats_h',\n output : 'formats.h',\n command : [gen_formats, '-o', '@OUTPUT@', '@INPUT@'],\n install : true,\n- install_dir : get_option('includedir') / libcamera_include_dir)\n+ install_dir : libcamera_headers_install_dir)\n libcamera_public_headers += formats_h\n \n # libcamera.h\n@@ -68,7 +70,7 @@ libcamera_h = custom_target('gen-header',\n output : 'libcamera.h',\n command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],\n install : true,\n- install_dir : get_option('includedir') / libcamera_include_dir)\n+ install_dir : libcamera_headers_install_dir)\n \n libcamera_public_headers += libcamera_h\n \n@@ -82,4 +84,4 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])\n configure_file(input : 'version.h.in',\n output : 'version.h',\n configuration : libcamera_version_config,\n- install_dir : get_option('includedir') / libcamera_include_dir)\n+ install_dir : libcamera_headers_install_dir)\n","prefixes":["libcamera-devel","v2","2/2"]}