From patchwork Tue Apr 14 18:02:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ariel D'Alessandro X-Patchwork-Id: 3461 Return-Path: Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id ED26262E39 for ; Tue, 14 Apr 2020 20:02:44 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="By8n5oZy"; dkim-atps=neutral Received: by mail-qt1-x834.google.com with SMTP id o10so10953501qtr.6 for ; Tue, 14 Apr 2020 11:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=77RDj7yRifJbg7U4NzqFFZUXQS55msMFiiaNiKutn6o=; b=By8n5oZyOs7TOQnLgfKdubfi3LQyyM9Zue0Xp+M/pu8PtkTrDUsWSrryavuOiUxTGO wJKZs+dloHFAeeVxDgBUQr5dCJ23h0slnCbPEwGSggsuf9Z5e/xjeDVkPFmgYDf6ZSUK gJ41vjFGMLW1G1yTm5Bmv5YRSJpzY5rSiFoJA+Huzh0Gj3FodekEeJujzUFtARJyU9iX qKyZa1sIjlbOlECAtwpqi/GqagQSJtLS2YPPWLtgeF9sZb1UcEf9+PbPb06QEoUz5O6m t8s2KiMeeOqj+i4sWjB7JB4e9mfxl41vBWc7W4hd5sh3aMKpYSJimYn6LdC1Ich71eW8 8LlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=77RDj7yRifJbg7U4NzqFFZUXQS55msMFiiaNiKutn6o=; b=MhnAvBHYtGgtDujhVmeSSPlOlhI+ZuZWGIMrdSV+GtA2hAxnwyLT9PcjX1LhQ5Guhk BpY+p7LBRjsYZY3q68YFz4uvGNhKKMAPy217Db04yxSxi2gIq+3PnxpbOlmr6qPnbwMJ bVHOdEgrMZlIOd40anSe9iWNgCvg1WRbPRQRPVsjBgFFDDhUzGL5QIiiH17YMuI7ldcV Ga/QfjDPGVCFk3aWEMeFAgt/EyVLFdMUkhE77ZCC8ee63bdLnpuXcpf7rBw1agOwR4CT mxUsNTuIbKw+9itultLoJcMPTOFnjkk4VeyV3RhJpnE4YjEbhayYvVXu/TgMfAAm3M/t bCSQ== X-Gm-Message-State: AGi0Pub3i+NSDttBlQKtDTPOJqETsdym+c09olANhHa0XvCi2sH26g25 cV8+xK0VisEzrktM2adivJNfWUQG9fU= X-Google-Smtp-Source: APiQypKeNc9pvnXgfpLUvvgh1kcfyMSktwNyytFer/4PCKrgJC7hb/eoKIYa+Bkhu23wMXnoofDMTg== X-Received: by 2002:ac8:60d6:: with SMTP id i22mr17541880qtm.249.1586887363833; Tue, 14 Apr 2020 11:02:43 -0700 (PDT) Received: from localhost.localdomain ([186.136.155.69]) by smtp.gmail.com with ESMTPSA id x55sm1791212qtk.3.2020.04.14.11.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 11:02:43 -0700 (PDT) From: Ariel D'Alessandro To: libcamera-devel@lists.libcamera.org Date: Tue, 14 Apr 2020 15:02:28 -0300 Message-Id: <20200414180229.10320-2-ariel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200414180229.10320-1-ariel@vanguardiasur.com.ar> References: <20200414180229.10320-1-ariel@vanguardiasur.com.ar> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] meson: Bump required version to 0.51 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-List-Received-Date: Tue, 14 Apr 2020 18:02:45 -0000 This is needed to use the 'modules' keyword argument in pymod.find_installation(). This function in the Python module will check for a Python installation with the specified modules installed. Libcamera runs a few python scripts during build, which contain python module dependencies that should be checked. NOTE: If you don't have a recent enough meson in your distribution, you can always install or upgrade your version using pip3. $ pip3 install --user meson $ pip3 install --user --upgrade meson Signed-off-by: Ariel D'Alessandro --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c6e6a93..a2dda79 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('libcamera', 'c', 'cpp', - meson_version : '>= 0.47', + meson_version : '>= 0.51', version : '0.0.0', default_options : [ 'werror=true', From patchwork Tue Apr 14 18:02:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ariel D'Alessandro X-Patchwork-Id: 3462 Return-Path: Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 164F862E3D for ; Tue, 14 Apr 2020 20:02:47 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=vanguardiasur-com-ar.20150623.gappssmtp.com header.i=@vanguardiasur-com-ar.20150623.gappssmtp.com header.b="MuouMiXr"; dkim-atps=neutral Received: by mail-qt1-x836.google.com with SMTP id s30so10987908qth.2 for ; Tue, 14 Apr 2020 11:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fdSJP1+0mmYhPLRdDjOntAMIOTF93tJaAvNsnZg6sy0=; b=MuouMiXrFiNtqcpI6NzB8xpFkj/C9mwp1u0L+9+u+s9UZ9SvfM2wnWwmzU9F1Q2EF1 gNmU2gviGq7i52SK36HlrE7jXMVrplJfMiPpil+RNwpKKp8OYf7Zr62/frzYR7XXa166 3q1gSzj1lJvIXkUikLNKS474pXfUAXhy4uzmIfD6sOctjWCJ6ICT/jMP5/ntvBAhlsPM IRDAPU48V8+nRm8S2/Z8QjsFaQ4fDg/mgvkjvezAh0rpeM3s4qKAuayYxdhiFqS47/O0 hNgCFvzUZrcNfyJw8ReFPoMZmwmHtRc9Tpxs0lcsKqxmu3qyzVs+pZ8N9vfe7g3i10Fb 9T/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fdSJP1+0mmYhPLRdDjOntAMIOTF93tJaAvNsnZg6sy0=; b=g91wT1SCbkXCZuoYmYlF89tb9r1sDhAw7YenWBuC+HURxbNMJ87Mt9uRD9lBolZIET 5VOAh5tiIHemVSeak/yR/qVju5AHye48rXXI/hWlsQU0/agnt5HGN3L+Ve1D0cD1Jt4p F3TclpEzoyobIFEwCotpEDN7lESdmPohIsx3GTAjdTUnMjtMNFevnmy5FCQOIOe/wqH9 tjsi0n9dNs6PkRlttS1VMv7bqtdv1xFGoWYNlcststzv+lMRx/rgprstRNSNw6oC1GBT tYbl1dUHPTMu2xlPtxpYoUgjVlrHvodVQASxNSYCG/SQwzKKL5Clck3wFaG7Avxa6gWK dLvQ== X-Gm-Message-State: AGi0PubFPrERr8X7bo5qc0fhg8ctqrrJBY1NvlrBrfptX882uNCKM7Ac lkZF7Cfg6DvFuQ00yjrFyFKwAUQ52DM= X-Google-Smtp-Source: APiQypJPWvvPtM/vEZmn0SOTciSb5N7Mq7ipIqGYcLf8Lp41/y0eot0tpr8jsPvxcgc90mdIqqp6ug== X-Received: by 2002:ac8:664a:: with SMTP id j10mr17737108qtp.167.1586887365683; Tue, 14 Apr 2020 11:02:45 -0700 (PDT) Received: from localhost.localdomain ([186.136.155.69]) by smtp.gmail.com with ESMTPSA id x55sm1791212qtk.3.2020.04.14.11.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 11:02:45 -0700 (PDT) From: Ariel D'Alessandro To: libcamera-devel@lists.libcamera.org Date: Tue, 14 Apr 2020 15:02:29 -0300 Message-Id: <20200414180229.10320-3-ariel@vanguardiasur.com.ar> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200414180229.10320-1-ariel@vanguardiasur.com.ar> References: <20200414180229.10320-1-ariel@vanguardiasur.com.ar> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/2] libcamera: meson: Add check on required python modules 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-List-Received-Date: Tue, 14 Apr 2020 18:02:47 -0000 Libcamera runs a few python scripts during build, which contain python module dependencies that should be checked. Signed-off-by: Ariel D'Alessandro --- include/libcamera/meson.build | 1 + meson.build | 2 ++ src/libcamera/meson.build | 1 + 3 files changed, 4 insertions(+) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 23c01d3..1a2fc68 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -24,6 +24,7 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera') install_headers(libcamera_api, subdir : include_dir) +python.find_installation(modules: 'yaml') gen_controls = files('../../src/libcamera/gen-controls.py') control_source_files = [ diff --git a/meson.build b/meson.build index a2dda79..2b0e035 100644 --- a/meson.build +++ b/meson.build @@ -8,6 +8,8 @@ project('libcamera', 'c', 'cpp', ], license : 'LGPL 2.1+') +python = import('python') + # Generate version information. The libcamera_git_version variable contains the # full version with git patch count and SHA1 (e.g. 1.2.3+211-c94a24f4), while # the libcamera_version variable contains the major.minor.patch (e.g. 1.2.3) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index c502450..757bb78 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -76,6 +76,7 @@ if libudev.found() ]) endif +python.find_installation(modules: 'yaml') gen_controls = files('gen-controls.py') control_sources = []