From patchwork Mon May 27 17:40:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 20104 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 70AF8C32C8 for ; Mon, 27 May 2024 17:40:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BC1D3634B5; Mon, 27 May 2024 19:40:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="sG5qagaZ"; 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 E4DF2634AF for ; Mon, 27 May 2024 19:40:28 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 859371586 for ; Mon, 27 May 2024 19:40:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1716831626; bh=yswmm/DhaPODHu6Lm+Qqc6hOwyCqzULSSfXBlfedK+A=; h=From:To:Subject:Date:In-Reply-To:References:From; b=sG5qagaZVcJVjSdZ3Xac7173Df74rOqRrpx5FtbvY/xes50fEQAAvkpKvpp2jsC0u n/1pHW/VCMh57Cs5X5mUgVd4GQZWzKQWaEEVtlXmihnOBuv/DIcFegFQnZ4zt2v851 9Lkpsg61D2pGIZaxbKYdAVS0oQ/y+A3b2BfsnAss= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [CI] [PATCH 1/2] Enable compilation of the Android camera HAL Date: Mon, 27 May 2024 20:40:15 +0300 Message-ID: <20240527174016.11415-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240527174016.11415-1-laurent.pinchart@ideasonboard.com> References: <20240527174016.11415-1-laurent.pinchart@ideasonboard.com> 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" Expend compilation test coverage by enabling the Android camera HAL in test builds. This requires adding the cmake package to the container images, as it is needed to build the libyuv subproject. Debian buster ships a too old cmake version, so disable the Android HAL compilation there. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- .gitlab-ci/setup-container.sh | 1 + gitlab-ci.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh index 6f75c3209eb7..fc3c0568bf7c 100755 --- a/.gitlab-ci/setup-container.sh +++ b/.gitlab-ci/setup-container.sh @@ -34,6 +34,7 @@ PKGS_LIBCAMERA_CBUILD=( PKGS_LIBCAMERA_RUNTIME=( clang clang-format + cmake doxygen g++ ghostscript diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 60e52deac520..465931a761fc 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -12,6 +12,7 @@ variables: GIT_DEPTH: 1 KERNEL_VERSION: '6.6' MESON_ALL_OPTIONS: >- + -D android=enabled -D cam=enabled -D documentation=enabled -D gstreamer=enabled @@ -58,17 +59,17 @@ include: .libcamera-ci.debian:11: variables: FDO_DISTRIBUTION_VERSION: 'bullseye' - FDO_DISTRIBUTION_TAG: '2024-05-07.1' + FDO_DISTRIBUTION_TAG: '2024-05-27.0' .libcamera-ci.debian:12: variables: FDO_DISTRIBUTION_VERSION: 'bookworm' - FDO_DISTRIBUTION_TAG: '2024-04-18.0' + FDO_DISTRIBUTION_TAG: '2024-05-27.0' .libcamera-ci.debian:13: variables: FDO_DISTRIBUTION_VERSION: 'trixie' - FDO_DISTRIBUTION_TAG: '2024-04-18.0' + FDO_DISTRIBUTION_TAG: '2024-05-27.0' .container-debian: extends: @@ -159,6 +160,9 @@ build-full:debian:10: ARCH: amd64 CC: gcc-8 CXX: g++-8 + MESON_OPTIONS: >- + ${MESON_ALL_OPTIONS} + -D android=disabled build-full:debian:11: extends: