{"id":18286,"url":"https://patchwork.libcamera.org/api/1.1/patches/18286/?format=json","web_url":"https://patchwork.libcamera.org/patch/18286/","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":"","date":"2023-02-17T12:42:36","name":"[libcamera-devel] meson: Allow for build metadata in project version","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"68edd73f4bd16d2b79704b4b326b65627f7c4ea3","submitter":{"id":135,"url":"https://patchwork.libcamera.org/api/1.1/people/135/?format=json","name":"Michael Riesch","email":"michael.riesch@wolfvision.net"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18286/mbox/","series":[{"id":3757,"url":"https://patchwork.libcamera.org/api/1.1/series/3757/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3757","date":"2023-02-17T12:42:36","name":"[libcamera-devel] meson: Allow for build metadata in project version","version":1,"mbox":"https://patchwork.libcamera.org/series/3757/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18286/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18286/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 5D84ABDB13\n\tfor ;\n\tFri, 17 Feb 2023 12:44:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9D59062601;\n\tFri, 17 Feb 2023 13:44:01 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1676637841;\n\tbh=0vQBdhQdaU9imtP+A0TrWQLRN2CSr/ZzOnHmWQsKTEs=;\n\th=To:Date:List-Id:List-Post:From:List-Subscribe:List-Unsubscribe:\n\tList-Archive:Reply-To:List-Help:Subject:From;\n\tb=nuN/Arqbs1E3KsEQflb+QNUENYmId7FN5azBu+yjOj7nTZuIuOXtgIcnq8XwaBRd4\n\t99+Y+43t76/xpHctPd+Itqqirtcdbqn+VRLVCYj6fpHxH9TibIuGU4rFp7wRIldAzO\n\twKqluadKtEQKvYswtN4hrvfI3788TtLuBKzLueAu765tqam6pIoBJ/aXMiccBeBM3C\n\t6nxFLfpBLv6qHHQELggW/JJy2KFWCG5+OPdVrttE3SbKq9kAG9WxgnEytWyIGI2Kyg\n\t3Uiig8d8kZxYXu6Jzdmbpnpjwiyz5ZSynLj+/MvDfKc4lT9o62sgqwkO1HGkvma066\n\tmBO1Eo4WiGZ2g==","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 17 Feb 2023 13:42:36 +0100","MIME-Version":"1.0","Message-ID":"","List-Id":"","List-Post":"","From":"Michael Riesch via libcamera-devel\n\t","Precedence":"list","X-Mailman-Version":"2.1.29","X-BeenThere":"libcamera-devel@lists.libcamera.org","List-Subscribe":",\n\t","List-Unsubscribe":",\n\t","List-Archive":"","Reply-To":"Michael Riesch ","List-Help":"","Subject":"[libcamera-devel] [PATCH] meson: Allow for build metadata in\n\tproject version","Content-Type":"message/rfc822","Content-Disposition":"inline","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The build metadata is split off correctly from the version string\nobtained with utils/gen-version.sh, but for the meson project version\nthis step is not carried out.\n\nAllow for build metadata in the meson project version, which may be\nused by package maintainers.\n\nSigned-off-by: Michael Riesch \n---\n meson.build | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/meson.build b/meson.build\nindex 9eee9d39..d518454d 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -29,9 +29,10 @@ libcamera_version = libcamera_git_version.split('+')[0]\n # A shallow clone, or a clone without a reachable tag equivalent to the\n # meson.project_version() could leave the project in a mis-described state.\n # Produce a warning in this event, and fix to a best effort.\n-if libcamera_version != meson.project_version()\n+if libcamera_version != meson.project_version().split('+')[0]\n warning('The sources disagree about the version: '\n- + libcamera_version + ' != ' + meson.project_version())\n+ + libcamera_version + ' != '\n+\t + meson.project_version().split('+')[0])\n \n summary({'libcamera git version' : libcamera_git_version,\n 'Source version match' : false,\n@@ -40,9 +41,9 @@ if libcamera_version != meson.project_version()\n \n # Replace the version components reported by git with the release version,\n # but keep all trailing information supplied by git.\n- libcamera_git_version = (meson.project_version() +\n+ libcamera_version = meson.project_version().split('+')[0]\n+ libcamera_git_version = (libcamera_version +\n libcamera_git_version.strip(libcamera_version))\n- libcamera_version = meson.project_version()\n \n # Append a marker to show we have modified this version string\n libcamera_git_version += '-nvm'\n","prefixes":["libcamera-devel"]}