[libcamera-devel] libcamera: pkg-config: Do not hardcode version
diff mbox series

Message ID 20220104232657.1350703-1-kieran.bingham@ideasonboard.com
State Accepted
Commit cd7863503ae91f477bbd883f35d9845172840349
Delegated to: Kieran Bingham
Headers show
Series
  • [libcamera-devel] libcamera: pkg-config: Do not hardcode version
Related show

Commit Message

Kieran Bingham Jan. 4, 2022, 11:26 p.m. UTC
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 <kieran.bingham@ideasonboard.com>
---

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(-)

Comments

Laurent Pinchart Jan. 4, 2022, 11:33 p.m. UTC | #1
Hi Kieran,

Thank you for the patch.

On Tue, Jan 04, 2022 at 11:26:57PM +0000, Kieran Bingham wrote:
> 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 <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> 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')
>
Jacopo Mondi Jan. 6, 2022, 10:25 a.m. UTC | #2
Hi Kieran

On Tue, Jan 04, 2022 at 11:26:57PM +0000, Kieran Bingham wrote:
> 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 <kieran.bingham@ideasonboard.com>

Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

Thanks
  j

> ---
>
> 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')
>
> --
> 2.30.2
>

Patch
diff mbox series

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')