[libcamera-devel,v7,01/13] meson: require meson 0.56+

15784 diff mbox series

Ubuntu 22.04 LTS has been released with meson 0.61.2, and it is easy to
install a recent version of meson with python-pip, so let's update the
required meson version to get rid of the Android compilation
limitation.

Additionally, going to meson 0.55 gives the ability to have patch files
for git-wraps which is useful for Python bindings.

0.56 brings meson.project_source_root() and meson.project_build_root(),
allowing us to get rid of the deprecated meson.source_root() and
meson.build_root().

So, let's update the required meson version to 0.56.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
---
 README.rst  | 4 +---
 meson.build | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

Quoting Tomi Valkeinen (2022-05-05 11:40:52)
> Ubuntu 22.04 LTS has been released with meson 0.61.2, and it is easy to
> install a recent version of meson with python-pip, so let's update the
> required meson version to get rid of the Android compilation
> limitation.
> 
> Additionally, going to meson 0.55 gives the ability to have patch files
> for git-wraps which is useful for Python bindings.
> 
> 0.56 brings meson.project_source_root() and meson.project_build_root(),
> allowing us to get rid of the deprecated meson.source_root() and
> meson.build_root().
> 
> So, let's update the required meson version to 0.56.
> 

Sounds good to me!

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> ---
>  README.rst  | 4 +---
>  meson.build | 6 +-----
>  2 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/README.rst b/README.rst
> index aae6b79f..ae5ede17 100644
> --- a/README.rst
> +++ b/README.rst
> @@ -47,9 +47,7 @@ A C++ toolchain: [required]
>          Either {g++, clang}
>  
>  Meson Build system: [required]
> -        meson (>= 0.53) ninja-build pkg-config
> -
> -        meson (>= 0.55) is required for building Android (-Dandroid=enabled)
> +        meson (>= 0.56) ninja-build pkg-config
>  
>          If your distribution doesn't provide a recent enough version of meson,
>          you can install or upgrade it using pip3.
> diff --git a/meson.build b/meson.build
> index 29d8542d..b892ba84 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1,11 +1,7 @@
>  # SPDX-License-Identifier: CC0-1.0
>  
>  project('libcamera', 'c', 'cpp',
> -    # Use of the Android component requires meson 0.55, but Ubuntu 20.04 LTS
> -    # ships meson 0.53. Improve the Ubuntu experience at the expense of
> -    # Android as the former is a much more common use case than the latter at
> -    # this point. This should be fixed after Ubuntu releases 22.04 LTS.
> -    meson_version : '>= 0.53',
> +    meson_version : '>= 0.56',
>      version : '0.0.0',
>      default_options : [
>          'werror=true',
> -- 
> 2.34.1
>

On Thu, May 05, 2022 at 01:30:06PM +0100, Kieran Bingham wrote:
> Quoting Tomi Valkeinen (2022-05-05 11:40:52)
> > Ubuntu 22.04 LTS has been released with meson 0.61.2, and it is easy to
> > install a recent version of meson with python-pip, so let's update the
> > required meson version to get rid of the Android compilation
> > limitation.
> > 
> > Additionally, going to meson 0.55 gives the ability to have patch files
> > for git-wraps which is useful for Python bindings.
> > 
> > 0.56 brings meson.project_source_root() and meson.project_build_root(),
> > allowing us to get rid of the deprecated meson.source_root() and
> > meson.build_root().
> > 
> > So, let's update the required meson version to 0.56.
> 
> Sounds good to me!
> 
> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Debian stable ships 0.56.2, so this looks good to me.

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

> > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
> > ---
> >  README.rst  | 4 +---
> >  meson.build | 6 +-----
> >  2 files changed, 2 insertions(+), 8 deletions(-)
> > 
> > diff --git a/README.rst b/README.rst
> > index aae6b79f..ae5ede17 100644
> > --- a/README.rst
> > +++ b/README.rst
> > @@ -47,9 +47,7 @@ A C++ toolchain: [required]
> >          Either {g++, clang}
> >  
> >  Meson Build system: [required]
> > -        meson (>= 0.53) ninja-build pkg-config
> > -
> > -        meson (>= 0.55) is required for building Android (-Dandroid=enabled)
> > +        meson (>= 0.56) ninja-build pkg-config
> >  
> >          If your distribution doesn't provide a recent enough version of meson,
> >          you can install or upgrade it using pip3.
> > diff --git a/meson.build b/meson.build
> > index 29d8542d..b892ba84 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1,11 +1,7 @@
> >  # SPDX-License-Identifier: CC0-1.0
> >  
> >  project('libcamera', 'c', 'cpp',
> > -    # Use of the Android component requires meson 0.55, but Ubuntu 20.04 LTS
> > -    # ships meson 0.53. Improve the Ubuntu experience at the expense of
> > -    # Android as the former is a much more common use case than the latter at
> > -    # this point. This should be fixed after Ubuntu releases 22.04 LTS.
> > -    meson_version : '>= 0.53',
> > +    meson_version : '>= 0.56',
> >      version : '0.0.0',
> >      default_options : [
> >          'werror=true',