From patchwork Mon May 9 22:25:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 15837 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 CB76CC3256 for ; Mon, 9 May 2022 22:26:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1CCC165646; Tue, 10 May 2022 00:26:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1652135169; bh=Sfpa/vif6idCc7wbOhqqLAAZnxTfAshMlKWuolhHcGQ=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=W9PHHzDGOo5+y6xG/0UI3nUBgRZ/2VgBVYkeVv/xuj/yZQX+/xINTMMYadZ8vr0gh e2sLUZqhrxbP52p7PNkBkWYt6QvNcliUXAlRS49TsWmqF3yidf93SAM32jMIvxDIgu Mrl1xGDNQzxSJnIix96xwB7nGjM+sHmDsjsrnxuFM75CiOz0ZPUB7UP0QT9ttFU01S blCUNqZJRPbpsqYyHPLzfW66K7dV4Ev7oBBzBlRk2wbCh33dhmevd7BDpuMtO4MsDG ObCGqnZ61gClGv08X1BiNTmuDAdXgnhAQNbGY3cfE5EcUleVg88NW7l48aS6htyjeZ zzKTTygtPGzQQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 07C8860421 for ; Tue, 10 May 2022 00:26:07 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="jxDjtMR0"; dkim-atps=neutral Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 778A15A4 for ; Tue, 10 May 2022 00:26:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1652135166; bh=Sfpa/vif6idCc7wbOhqqLAAZnxTfAshMlKWuolhHcGQ=; h=From:To:Subject:Date:From; b=jxDjtMR0h1sDfTF5hTveM5uv+0mwHIoboHdlCEZTfwEXAtJJ1qkDvas5oK1AyLgXU NIJBIdLUiteZYffJKqpOlwIja2b0ZJmjHW0u0NpDVoX6mvG7/0/sIv3l4dGOCff6Gh 4MvQvkD1Z2NCopcAlZv02lnqFxevn4Gqp5JtoJlI= To: libcamera-devel@lists.libcamera.org Date: Tue, 10 May 2022 01:25:58 +0300 Message-Id: <20220509222558.31342-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] meson: Compile libyaml as a subproject if not available on the system 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: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" AOSP doesn't ship libyaml, making it more difficult to compile libcamera for Android. Use a meson wrap to compile libyaml as a subproject if the dependency is not found. Signed-off-by: Laurent Pinchart Tested-by: Eric Curtin Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain --- src/libcamera/meson.build | 13 ++++++++++++- subprojects/.gitignore | 3 ++- subprojects/libyaml.wrap | 5 +++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 subprojects/libyaml.wrap base-commit: 6d990f102fd829feb05e37e5f242a796fcada1b5 diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index f8e18e035575..d1a6c5c88159 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -67,7 +67,7 @@ subdir('proxy') libdl = cc.find_library('dl') libgnutls = cc.find_library('gnutls', required : true) libudev = dependency('libudev', required : false) -libyaml = dependency('yaml-0.1', required : true) +libyaml = dependency('yaml-0.1', required : false) if libgnutls.found() config_h.set('HAVE_GNUTLS', 1) @@ -88,6 +88,17 @@ if libudev.found() ]) endif +# Fallback to a subproject if libyaml isn't found, as it's not packaged in AOSP. +if not libyaml.found() + cmake = import('cmake') + + libyaml_vars = cmake.subproject_options() + libyaml_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'}) + libyaml_vars.append_compile_args('c', '-Wno-unused-value') + libyaml_wrap = cmake.subproject('libyaml', options : libyaml_vars) + libyaml = libyaml_wrap.dependency('yaml') +endif + control_sources = [] foreach source : control_source_files diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 391fde2ce1e0..f207720b271a 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1,3 +1,4 @@ /googletest-release* +/libyaml /libyuv -/packagecache \ No newline at end of file +/packagecache diff --git a/subprojects/libyaml.wrap b/subprojects/libyaml.wrap new file mode 100644 index 000000000000..3d7d0a328be4 --- /dev/null +++ b/subprojects/libyaml.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory = libyaml +url = https://github.com/yaml/libyaml +# tags/0.2.5 +revision = 2c891fc7a770e8ba2fec34fc6b545c672beb37e6