From patchwork Wed Apr 9 15:38:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= X-Patchwork-Id: 23155 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 1A705C3213 for ; Wed, 9 Apr 2025 15:38:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4D8366899E; Wed, 9 Apr 2025 17:38:20 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="IWgGYl1D"; 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 7950F627F4 for ; Wed, 9 Apr 2025 17:38:18 +0200 (CEST) Received: from pb-laptop.local (185.182.215.138.nat.pool.zt.hu [185.182.215.138]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 76A5E9CE for ; Wed, 9 Apr 2025 17:36:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1744212980; bh=sAUsm6EgmH5E3UfHM1xHILqQOV8bW4nZLAIRAljKOQY=; h=From:To:Subject:Date:From; b=IWgGYl1DRNbo/liX/bpVbI9y9ftyN2PNRDiqv2U5AkSnY0UD8OTiZcb8Qh1vA8TgQ m+ROH0QzfF1loFAslhHq3ABC0m7YH71TNeCB0dkfrVc/jYaVVMPN5m5bed2QVVipgo rVropSi5M1nt5h8tUdO8yMh0jaqx2b7bbeLx6tRQ= From: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= To: libcamera-devel@lists.libcamera.org Subject: [libcamera-ci] [PATCH v1] Adapt to `v4l2` meson option type change Date: Wed, 9 Apr 2025 17:38:14 +0200 Message-ID: <20250409153814.704320-1-barnabas.pocze@ideasonboard.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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" 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 Reviewed-by: Laurent Pinchart --- .gitlab-ci/build-libcamera-cros.sh | 1 - gitlab-ci.yml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.49.0 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: