v4l2: Move the v4l2 compat layer to libexec/libcamera
Move the v4l2-compat.so shared library installation to the libcamera directory under libexec. This is the same location that the proxy workers live and will facilitate easier packaging of the V4L2 compatibility layer with distributions. Create a new libcamera_libexecdir variable within meson to simplify representation of this path and update the proxy worker meson.build infrastructure to make use of it as well. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
proxy_install_dir = get_option('libexecdir') / 'libcamera'
|
||||
proxy_install_dir = libcamera_libexecdir
|
||||
|
||||
# generate {pipeline}_ipa_proxy_worker.cpp
|
||||
foreach mojom : ipa_mojoms
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# Cache system paths
|
||||
libcamera_datadir = get_option('datadir') / 'libcamera'
|
||||
libcamera_libdir = get_option('libdir') / 'libcamera'
|
||||
libcamera_libexecdir = get_option('libexecdir') / 'libcamera'
|
||||
libcamera_sysconfdir = get_option('sysconfdir') / 'libcamera'
|
||||
|
||||
config_h.set('LIBCAMERA_DATA_DIR', '"' + get_option('prefix') / libcamera_datadir + '"')
|
||||
|
||||
@@ -31,6 +31,7 @@ v4l2_compat = shared_library('v4l2-compat',
|
||||
v4l2_compat_sources,
|
||||
name_prefix : '',
|
||||
install : true,
|
||||
install_dir : libcamera_libexecdir,
|
||||
dependencies : [libcamera_private, libdl],
|
||||
cpp_args : v4l2_compat_cpp_args)
|
||||
|
||||
@@ -38,7 +39,7 @@ v4l2_compat = shared_library('v4l2-compat',
|
||||
# adaptation layer.
|
||||
|
||||
cdata = configuration_data()
|
||||
cdata.set('LIBCAMERA_V4L2_SO', get_option('prefix') / get_option('libdir') / 'v4l2-compat.so')
|
||||
cdata.set('LIBCAMERA_V4L2_SO', get_option('prefix') / libcamera_libexecdir / 'v4l2-compat.so')
|
||||
|
||||
configure_file(input : 'libcamerify.in',
|
||||
output : 'libcamerify',
|
||||
|
||||
Reference in New Issue
Block a user