From patchwork Sat Mar 7 21:13:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3046 Return-Path: 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 DE69162907 for ; Sat, 7 Mar 2020 22:13:39 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7E2115F for ; Sat, 7 Mar 2020 22:13:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583615619; bh=Zx0RHaXPXMPgr+SfAO1Sutx8mYbZOSirqQQ6DSYeDZU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mqYPD6MbyiYWukPhylJinUjvmsbFqq3DzXCEd48AMbrAvQoFA6Djn6ACJx/QUiRQL xDXwAXP0oFM12cwG+xY2ZjCOGV/SURnA7VpqDPSDwKNajPuaxHtWPqamAiDT4qlQ6z v8cDbU116ItPj3qMJIkuBXnl66kz+wpbPu3yw/eg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 7 Mar 2020 23:13:25 +0200 Message-Id: <20200307211326.26994-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> References: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 6/7] v4l2: v4l2_compat: Use correct libcamera_dep dependency 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: Sat, 07 Mar 2020 21:13:40 -0000 The v4l2-compat shared library is declared as depending on libcamera_deps. This is not correct, as libcamera_deps contains the dependencies of libcamera itself. The correct dependency for users of libcamera is libcamera_dep. Fixing this allows dropping libcamera_includes from the list of includes required by v4l2-compat, and libcamera from the link_with list, as they are already contained in libcamera_dep. We however need to add an explicit dependency on libdl which was previously provided by libcamera_deps. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/v4l2/meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index 14ee3594747d..91f4170da852 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -5,11 +5,6 @@ v4l2_compat_sources = files([ 'v4l2_compat_manager.cpp', ]) -v4l2_compat_includes = [ - libcamera_includes, - libcamera_internal_includes, -] - v4l2_compat_cpp_args = [ # Meson enables large file support unconditionally, which redirect file # operations to 64-bit versions. This results in some symbols being @@ -21,11 +16,18 @@ v4l2_compat_cpp_args = [ '-fvisibility=hidden', ] +v4l2_compat_deps = [ + cc.find_library('dl'), +] + +v4l2_compat_includes = [ + libcamera_internal_includes, +] + v4l2_compat = shared_library('v4l2-compat', v4l2_compat_sources, name_prefix : '', install : true, - link_with : libcamera, include_directories : v4l2_compat_includes, - dependencies : libcamera_deps, + dependencies : [ libcamera_dep, v4l2_compat_deps ], cpp_args : v4l2_compat_cpp_args)