[libcamera-devel,1/2] media-libs/libcamera: Android support is a feature not a boolean
diff mbox series

Message ID 20201109011656.2560957-2-niklas.soderlund@ragnatech.se
State Not Applicable
Delegated to: Niklas Söderlund
Headers show
Series
  • media-libs/libcamera: Small fixes for IPA builds
Related show

Commit Message

Niklas Söderlund Nov. 9, 2020, 1:16 a.m. UTC
Upstream switched the android option from a boolean to a meson feature,
update ebuild to reflect this.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 media-libs/libcamera/libcamera-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tomasz Figa Nov. 10, 2020, 10:06 a.m. UTC | #1
Hi Niklas,


On Mon, Nov 9, 2020 at 10:17 AM Niklas Söderlund
<niklas.soderlund@ragnatech.se> wrote:
>
> Upstream switched the android option from a boolean to a meson feature,
> update ebuild to reflect this.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  media-libs/libcamera/libcamera-9999.ebuild | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild
> index 4273adbc9e1e0f33..57ff00337309f30c 100644
> --- a/media-libs/libcamera/libcamera-9999.ebuild
> +++ b/media-libs/libcamera/libcamera-9999.ebuild
> @@ -35,7 +35,7 @@ src_configure() {
>         local emesonargs=(
>                 $(meson_use doc documentation)
>                 $(meson_use test)
> -               -Dandroid="true"
> +               -Dandroid=enabled
>                 -Dpipelines="$(pipeline_list "${pipelines[@]}")"
>         )
>         meson_src_configure
> --
> 2.25.1
>

Not sure why this wasn't the case for you, but this has been fixed in
Chromium OS for quite a long time already:
https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2418720

Best regards,
Tomasz
Niklas Söderlund Nov. 10, 2020, 10:11 a.m. UTC | #2
Hi Tomasz,

On 2020-11-10 19:06:41 +0900, Tomasz Figa wrote:
> Hi Niklas,
> 
> 
> On Mon, Nov 9, 2020 at 10:17 AM Niklas Söderlund
> <niklas.soderlund@ragnatech.se> wrote:
> >
> > Upstream switched the android option from a boolean to a meson feature,
> > update ebuild to reflect this.
> >
> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> > ---
> >  media-libs/libcamera/libcamera-9999.ebuild | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild
> > index 4273adbc9e1e0f33..57ff00337309f30c 100644
> > --- a/media-libs/libcamera/libcamera-9999.ebuild
> > +++ b/media-libs/libcamera/libcamera-9999.ebuild
> > @@ -35,7 +35,7 @@ src_configure() {
> >         local emesonargs=(
> >                 $(meson_use doc documentation)
> >                 $(meson_use test)
> > -               -Dandroid="true"
> > +               -Dandroid=enabled
> >                 -Dpipelines="$(pipeline_list "${pipelines[@]}")"
> >         )
> >         meson_src_configure
> > --
> > 2.25.1
> >
> 
> Not sure why this wasn't the case for you, but this has been fixed in
> Chromium OS for quite a long time already:
> https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2418720

Cool, did not know that. I'm still working on from the manifest for 
R87-13476 to have as much of common base as possible that's likely why I 
did not already have this fix.

> 
> Best regards,
> Tomasz
Tomasz Figa Nov. 10, 2020, 10:20 a.m. UTC | #3
On Tue, Nov 10, 2020 at 7:11 PM Niklas Söderlund
<niklas.soderlund@ragnatech.se> wrote:
>
> Hi Tomasz,
>
> On 2020-11-10 19:06:41 +0900, Tomasz Figa wrote:
> > Hi Niklas,
> >
> >
> > On Mon, Nov 9, 2020 at 10:17 AM Niklas Söderlund
> > <niklas.soderlund@ragnatech.se> wrote:
> > >
> > > Upstream switched the android option from a boolean to a meson feature,
> > > update ebuild to reflect this.
> > >
> > > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> > > ---
> > >  media-libs/libcamera/libcamera-9999.ebuild | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild
> > > index 4273adbc9e1e0f33..57ff00337309f30c 100644
> > > --- a/media-libs/libcamera/libcamera-9999.ebuild
> > > +++ b/media-libs/libcamera/libcamera-9999.ebuild
> > > @@ -35,7 +35,7 @@ src_configure() {
> > >         local emesonargs=(
> > >                 $(meson_use doc documentation)
> > >                 $(meson_use test)
> > > -               -Dandroid="true"
> > > +               -Dandroid=enabled
> > >                 -Dpipelines="$(pipeline_list "${pipelines[@]}")"
> > >         )
> > >         meson_src_configure
> > > --
> > > 2.25.1
> > >
> >
> > Not sure why this wasn't the case for you, but this has been fixed in
> > Chromium OS for quite a long time already:
> > https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2418720
>
> Cool, did not know that. I'm still working on from the manifest for
> R87-13476 to have as much of common base as possible that's likely why I
> did not already have this fix.
>

Uh, that's just 8 builds before that change landed. Close enough.

FWIW, we revisited the soraka-libcamera builder and it's up and
running (but the images don't boot because of some recent kernel 5.4
regression on Soraka that's being investigated). I've granted you
access to the images on CPFE, but somehow I still don't see them
there. Will investigate.

Best regards,
Tomasz

Patch
diff mbox series

diff --git a/media-libs/libcamera/libcamera-9999.ebuild b/media-libs/libcamera/libcamera-9999.ebuild
index 4273adbc9e1e0f33..57ff00337309f30c 100644
--- a/media-libs/libcamera/libcamera-9999.ebuild
+++ b/media-libs/libcamera/libcamera-9999.ebuild
@@ -35,7 +35,7 @@  src_configure() {
 	local emesonargs=(
 		$(meson_use doc documentation)
 		$(meson_use test)
-		-Dandroid="true"
+		-Dandroid=enabled
 		-Dpipelines="$(pipeline_list "${pipelines[@]}")"
 	)
 	meson_src_configure