| Message ID | 20250409153814.704320-1-barnabas.pocze@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi Barnabás, Thank you for the patch. On Wed, Apr 09, 2025 at 05:38:14PM +0200, Barnabás Pőcze wrote: > libcamera commit a945532314 ("meson: Convert `v4l2` into a feature option") > changed the type of the `v4l2` meson option from `boolean` to `feature`, and > while it is still possible to set boolean values, that is deprecated. > > Convert `v4l2=true` to `v4l2=enabled`, and remove `v4l2=false` as that is > already implied by `auto_features=disabled` specified earlier in the command. > > Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .gitlab-ci/build-libcamera-cros.sh | 1 - > gitlab-ci.yml | 5 ++--- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/.gitlab-ci/build-libcamera-cros.sh b/.gitlab-ci/build-libcamera-cros.sh > index 550f4e5..b153c2a 100755 > --- a/.gitlab-ci/build-libcamera-cros.sh > +++ b/.gitlab-ci/build-libcamera-cros.sh > @@ -26,7 +26,6 @@ libcamera_cros_setup() { > -Dpipelines=ipu3,uvcvideo \ > -Dtest=false \ > -Dudev=enabled \ > - -Dv4l2=false \ > build > } > > diff --git a/gitlab-ci.yml b/gitlab-ci.yml > index 0884362..11790bb 100644 > --- a/gitlab-ci.yml > +++ b/gitlab-ci.yml > @@ -25,7 +25,7 @@ variables: > -D test=true > -D tracing=enabled > -D udev=enabled > - -D v4l2=true > + -D v4l2=enabled > # clang fails to link with ASan if --no-undefined is enabled. > MESON_CLANG_OPTIONS: >- > -D b_lundef=false > @@ -285,7 +285,6 @@ build-package:debug: > -D lc-compliance=enabled > -D test=false > -D tracing=enabled > - -D v4l2=false > parallel: > matrix: > - ARCH: amd64 > @@ -409,7 +408,7 @@ test-unit: > -D pycamera=enabled > -D qcam=disabled > -D test=true > - -D v4l2=true > + -D v4l2=enabled > > test-lc-compliance:virtual: > extends:
diff --git a/.gitlab-ci/build-libcamera-cros.sh b/.gitlab-ci/build-libcamera-cros.sh index 550f4e5..b153c2a 100755 --- a/.gitlab-ci/build-libcamera-cros.sh +++ b/.gitlab-ci/build-libcamera-cros.sh @@ -26,7 +26,6 @@ libcamera_cros_setup() { -Dpipelines=ipu3,uvcvideo \ -Dtest=false \ -Dudev=enabled \ - -Dv4l2=false \ build } diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 0884362..11790bb 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -25,7 +25,7 @@ variables: -D test=true -D tracing=enabled -D udev=enabled - -D v4l2=true + -D v4l2=enabled # clang fails to link with ASan if --no-undefined is enabled. MESON_CLANG_OPTIONS: >- -D b_lundef=false @@ -285,7 +285,6 @@ build-package:debug: -D lc-compliance=enabled -D test=false -D tracing=enabled - -D v4l2=false parallel: matrix: - ARCH: amd64 @@ -409,7 +408,7 @@ test-unit: -D pycamera=enabled -D qcam=disabled -D test=true - -D v4l2=true + -D v4l2=enabled test-lc-compliance:virtual: extends:
libcamera commit a945532314 ("meson: Convert `v4l2` into a feature option") changed the type of the `v4l2` meson option from `boolean` to `feature`, and while it is still possible to set boolean values, that is deprecated. Convert `v4l2=true` to `v4l2=enabled`, and remove `v4l2=false` as that is already implied by `auto_features=disabled` specified earlier in the command. Signed-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> --- .gitlab-ci/build-libcamera-cros.sh | 1 - gitlab-ci.yml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.49.0