Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-23 16:45:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: v4l2_compat: Use correct libcamera_dep dependency

Browse source 
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-03-07 20:02:29 +02:00
parent f416271212
commit 20fb72a56e
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/v4l2/meson.build
View file

@ -5,11 +5,6 @@ v4l2_compat_sources = files([
'v4l2_compat_manager.cpp', 'v4l2_compat_manager.cpp',
]) ])
v4l2_compat_includes = [
libcamera_includes,
libcamera_internal_includes,
]
v4l2_compat_cpp_args = [ v4l2_compat_cpp_args = [
# Meson enables large file support unconditionally, which redirect file # Meson enables large file support unconditionally, which redirect file
# operations to 64-bit versions. This results in some symbols being # operations to 64-bit versions. This results in some symbols being
@ -25,7 +20,6 @@ v4l2_compat = shared_library('v4l2-compat',
v4l2_compat_sources, v4l2_compat_sources,
name_prefix : '', name_prefix : '',
install : true, install : true,
link_with : libcamera, include_directories : libcamera_internal_includes,
include_directories : v4l2_compat_includes, dependencies : [ libcamera_dep, libdl ],
dependencies : libcamera_deps,
cpp_args : v4l2_compat_cpp_args) cpp_args : v4l2_compat_cpp_args)