@@ -10,10 +10,13 @@ v4l2_compat_sources = files([
'v4l2_camera.cpp',
'v4l2_camera_file.cpp',
'v4l2_camera_proxy.cpp',
- 'v4l2_compat.cpp',
'v4l2_compat_manager.cpp',
])
+v4l2_compat_cpp_sources = files([
+ 'v4l2_compat.cpp',
+])
+
v4l2_compat_cpp_args = [
# Meson enables large file support unconditionally, which redirect file
# operations to 64-bit versions. This results in some symbols being
@@ -27,9 +30,16 @@ v4l2_compat_cpp_args = [
'-fvisibility=hidden',
]
+
+v4l2_compat_core = static_library('v4l2-compat-core',
+ v4l2_compat_sources,
+ install : false,
+ dependencies : [libcamera_private, libdl])
+
v4l2_compat = shared_library('v4l2-compat',
- v4l2_compat_sources,
+ v4l2_compat_cpp_sources,
name_prefix : '',
+ link_with : v4l2_compat_core,
install : true,
install_dir : libcamera_libexecdir,
dependencies : [libcamera_private, libdl],
On 32-bit systems, the whole libcamera V4L2 compatibility layer is compiled with 32-bit time_t as a consequence of disabling transparent large file support that in turn requires undefining _TIME_BITS. The compatibility layer ends up using the 32-bit time_t layout of V4L2 ioctl structures. This breaks applications compiled with 64-bit time_t support. Fixing this for all use cases requires translating between structures that use 32-bit and 64-bit time_t. A simpler partial solution is however possible for the most common cases. Transparent large file support and time_t impact different parts of the V4L2 compatibility layer. The former is only needed in the entry points, handled in v4l2_compat.cpp, while the latter only impacts the V4L2 ioctl handlers in v4l2_camera_proxy.cpp. We can compile the entry points with transparent large file support disabled (and therefore with 32-bit time_t), and the rest of the compatibility later with the system defaults. Applications using the same time_t size as the system default will work correctly. Two cases will still be unsupported: - Applications using 64-bit time_t on a 32-bit time_t system - Applications using 32-bit time_t on a 64-bit time_t system The former should be very rare, as systems are transitioning to 64-bit time_t. The latter is likely less rare, but is still not a very common use case. Implement the simpler fix for the time being. If hybrid time_t use cases need to be supported, translation between ioctl structures will be implemented. Closes: https://gitlab.freedesktop.org/camera/libcamera/-/issues/290 Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/v4l2/meson.build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)