From patchwork Tue Jan 4 23:26:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 15246 X-Patchwork-Delegate: kieran.bingham@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 48132BE080 for ; Tue, 4 Jan 2022 23:27:04 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A775360921; Wed, 5 Jan 2022 00:27:03 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="wct6q1Rk"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A69B6021A for ; Wed, 5 Jan 2022 00:27:01 +0100 (CET) Received: from Monstersaurus.ksquared.org.uk.beta.tailscale.net (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id F3B35501; Wed, 5 Jan 2022 00:27:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1641338821; bh=UZ9GTHpa7g/ap5a0qlN4tjf36BupmSDNwROqd15hTek=; h=From:To:Cc:Subject:Date:From; b=wct6q1Rkuurrj8+H+Mdx+bKiXjm5s+5WuRK5/Nin8DFSI7UHOJvDUdbVyNNSZRDYu fT3Mb0SWFfzRUN05H+BR5sBeQSMtNkxiCmqBiQV3tC8tkR2S0zHfzU8o3mA8y+jf/H jB6a6KpgdW4UFSC4TqXYy1pAwCHwXqw8wwtIEXdA= From: Kieran Bingham To: libcamera devel Date: Tue, 4 Jan 2022 23:26:57 +0000 Message-Id: <20220104232657.1350703-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: pkg-config: Do not hardcode version X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The pkg-config version should not be hardcoded, and it should match the version of the library, ideally with point releases where possible. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- With this patch, the pkg-config libcamera.pc will report Version: 0.0.0 As defined by our meson project instead of Version: 1.0 src/libcamera/base/meson.build | 1 - src/libcamera/meson.build | 1 - 2 files changed, 2 deletions(-) diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 0ae3b0aab7e2..7030ad1f5927 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -65,7 +65,6 @@ libcamera_base = declare_dependency(sources : [ pkg_mod = import('pkgconfig') pkg_mod.generate(libcamera_base_lib, - version : '1.0', description : 'Camera support base utility library', subdirs : 'libcamera') diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 7ae909d47fe5..26912ca17819 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -162,7 +162,6 @@ libcamera_private = declare_dependency(sources : [ pkg_mod = import('pkgconfig') pkg_mod.generate(libcamera, libraries : libcamera_base_lib, - version : '1.0', description : 'Complex Camera Support Library', subdirs : 'libcamera')