From patchwork Thu May 5 10:40:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 15784 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 CE957C0F2A for ; Thu, 5 May 2022 10:41:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BA0F36564F; Thu, 5 May 2022 12:41:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1651747288; bh=bB6rZ6S6R9ASu5qcUfCRjPXOiG5EUvfsuAzBK+VC0m4=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=mcyLIZv5jvtv+SwmTkEehRUSK46cKoEF2ut3q7gtAtDv4etdf0IGwzxoqpVkLhm1d 8H1ENjU3bK17rvpAjckBktpHCXP4+lqosE/xtHFBKRKmmyiGAsOm39vIkz4pCaK/7f ooQDFBBWfV4vu+sx6NJFjoN+h2JYIEDP4hV1qzeuZFuXXxPI3/ZI+6sfb2h8IDxQjs sbhAIBm2qPvhUvqVOwkZTnemEG1ZouvdckP0xPHZyx8VLMFPrnPOSFOdaj+a8vMymn lPW2g3klIHAzRjqWBAAq1MwqD/4x3XfSQHkEuQ/Q01cRLJENC4wtrMmPDgz19iISUl 9UxS4eu2/BRaA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1F117603AB for ; Thu, 5 May 2022 12:41:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="egsVuFWG"; dkim-atps=neutral Received: from deskari.lan (91-156-85-209.elisa-laajakaista.fi [91.156.85.209]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3DE444A8; Thu, 5 May 2022 12:41:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1651747285; bh=bB6rZ6S6R9ASu5qcUfCRjPXOiG5EUvfsuAzBK+VC0m4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=egsVuFWGY2lta7zukLRlYpYvO2QD6sgjz+UXZdGGQazcrbhsyH1zYtfB0YHOKsX9Z AiG4uXrUa1Gi5ANK+TcJB9zakQ/dBS72Z3hDN4PK/fTD2fefXUj319KL/tyCR7TbPo hE5Cksd81PfFLBn+iX/dQvLtgKRmdfJscZgCsNh0= To: libcamera-devel@lists.libcamera.org, David Plowman , Kieran Bingham , Laurent Pinchart , Jacopo Mondi Date: Thu, 5 May 2022 13:40:52 +0300 Message-Id: <20220505104104.70841-2-tomi.valkeinen@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220505104104.70841-1-tomi.valkeinen@ideasonboard.com> References: <20220505104104.70841-1-tomi.valkeinen@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 01/13] meson: require meson 0.56+ 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: , X-Patchwork-Original-From: Tomi Valkeinen via libcamera-devel From: Tomi Valkeinen Reply-To: Tomi Valkeinen Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- 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',