From 20fb72a56eb3afe347ac058c13b8c84fbff1ed40 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 7 Mar 2020 20:02:29 +0200 Subject: v4l2: v4l2_compat: Use correct libcamera_dep dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/v4l2/meson.build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index 14ee3594..efab968f 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) -- cgit v1.2.1