From patchwork Sun Mar 8 00:04:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3057 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 C7A5E60424 for ; Sun, 8 Mar 2020 01:04:44 +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 6075A5F for ; Sun, 8 Mar 2020 01:04:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583625884; bh=U9QS9lGGWSFk58zJoiLV/mtAfcTAQe2TccFXrPSQbGE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=VaGV/ILPdTdxHNDHpsDFw+SoLfG5WU56SIpWauIjr6mzsnevo0lW0nz3g9CvRaq15 R8dNTdB1RubCPwjL/aOTRb5EtyuYwuiNSZfmnQeyMobagJe/+gct9IoC9yAN0vKSCJ fb+Jv/eoP8sVC1l1iJwS93nEbVGc0lJuzipNgnKk= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 8 Mar 2020 02:04:33 +0200 Message-Id: <20200308000433.2917-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200308000433.2917-1-laurent.pinchart@ideasonboard.com> References: <20200308000433.2917-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 6/6] 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: Sun, 08 Mar 2020 00:04:45 -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 Reviewed-by: Niklas Söderlund --- Changes since v3: - Inline v4l2_compat_deps and v4l2_compat_includes - Use the libdl dependency object --- src/v4l2/meson.build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index 14ee3594747d..efab968f7729 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 @@ -25,7 +20,6 @@ v4l2_compat = shared_library('v4l2-compat', v4l2_compat_sources, name_prefix : '', install : true, - link_with : libcamera, - include_directories : v4l2_compat_includes, - dependencies : libcamera_deps, + include_directories : libcamera_internal_includes, + dependencies : [ libcamera_dep, libdl ], cpp_args : v4l2_compat_cpp_args)