This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-ctl/compliance: add -32-time64 variants Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Sun Sep 29 10:36:24 2024 +0200 Add support for compiling 32 bit variant using 64 bit time_t (i.e. support for year 2038). This is specifically for debug purposes, just like the existing -32 variants it is not something you will normally build. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> meson.build | 2 ++ meson_options.txt | 4 ++++ utils/v4l2-compliance/meson.build | 10 ++++++++++ utils/v4l2-ctl/meson.build | 11 +++++++++++ 4 files changed, 27 insertions(+) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=820c8f53648f328c1a599f81d83090134233f443 diff --git a/meson.build b/meson.build index d6c692f1a4d6..ce6db73c7014 100644 --- a/meson.build +++ b/meson.build @@ -452,10 +452,12 @@ summary({ get_option('v4l2-compliance-libv4l') ? 'with libv4l' : 'without libv4l', ], 'v4l2-compliance-32' : is_variable('v4l2_compliance_32'), + 'v4l2-compliance-32-time64' : is_variable('v4l2_compliance_32_time64'), 'v4l2-ctl' : [ is_variable('v4l2_ctl'), get_option('v4l2-ctl-libv4l') ? 'with libv4l' : 'without libv4l', ], 'v4l2-ctl-32' : is_variable('v4l2_ctl_32'), + 'v4l2-ctl-32-time64' : is_variable('v4l2_ctl_32_time64'), 'v4l2-tracer' : is_variable('v4l2_tracer'), }, bool_yn : true, section : 'Applications') diff --git a/meson_options.txt b/meson_options.txt index 53cf832f5e82..1e4aa87f8bee 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -22,10 +22,14 @@ option('v4l-wrappers', type : 'boolean', description : 'V4L wrappers support') option('v4l2-compliance-32', type : 'boolean', value : false, description : 'Enable v4l2-compliance-32 compilation (for debugging purposes only)') +option('v4l2-compliance-32-time64', type : 'boolean', value : false, + description : 'Enable v4l2-compliance-32-time64 compilation (for debugging purposes only)') option('v4l2-compliance-libv4l', type : 'boolean', description : 'Enable use of libv4l in v4l2-compliance') option('v4l2-ctl-32', type : 'boolean', value : false, description : 'Enable v4l2-ctl-32 compilation (for debugging purposes only)') +option('v4l2-ctl-32-time64', type : 'boolean', value : false, + description : 'Enable v4l2-ctl-32-time64 compilation (for debugging purposes only)') option('v4l2-ctl-libv4l', type : 'boolean', description : 'Enable use of libv4l in v4l2-ctl') option('v4l2-ctl-stream-to', type : 'boolean', diff --git a/utils/v4l2-compliance/meson.build b/utils/v4l2-compliance/meson.build index 142e9a94bf0e..6afbb83fce7c 100644 --- a/utils/v4l2-compliance/meson.build +++ b/utils/v4l2-compliance/meson.build @@ -51,6 +51,7 @@ v4l2_compliance = executable('v4l2-compliance', man_pages += [[ meson.current_source_dir(), 'v4l2-compliance', 1 ]] v4l2_compliance_32_cpp_args = ['-m32', '-DNO_LIBV4L2'] +v4l2_compliance_32_time64_cpp_args = v4l2_compliance_32_cpp_args + '-D_TIME_BITS=64' v4l2_compliance_32_link_args = ['-m32', '-static'] if get_option('v4l2-compliance-32') and have_m32 @@ -61,3 +62,12 @@ if get_option('v4l2-compliance-32') and have_m32 link_args : v4l2_compliance_32_link_args, include_directories : v4l2_compliance_incdir) endif + +if get_option('v4l2-compliance-32-time64') and have_m32 + v4l2_compliance_32_time64 = executable('v4l2-compliance-32-time64', + v4l2_compliance_sources, + install : true, + cpp_args : v4l2_compliance_32_time64_cpp_args, + link_args : v4l2_compliance_32_link_args, + include_directories : v4l2_compliance_incdir) +endif diff --git a/utils/v4l2-ctl/meson.build b/utils/v4l2-ctl/meson.build index 3e366c6c0496..8bcf8785878e 100644 --- a/utils/v4l2-ctl/meson.build +++ b/utils/v4l2-ctl/meson.build @@ -62,6 +62,7 @@ v4l2_ctl = executable('v4l2-ctl', man_pages += [[ meson.current_source_dir(), 'v4l2-ctl', 1 ]] v4l2_ctl_32_c_cpp_args = ['-m32', '-DNO_LIBV4L2'] +v4l2_ctl_32_time64_c_cpp_args = v4l2_ctl_32_c_cpp_args + '-D_TIME_BITS=64' v4l2_ctl_32_link_args = ['-m32', '-static'] if get_option('v4l2-ctl-32') and have_m32 @@ -73,3 +74,13 @@ if get_option('v4l2-ctl-32') and have_m32 link_args : v4l2_ctl_32_link_args, include_directories : v4l2_ctl_incdir) endif + +if get_option('v4l2-ctl-32-time64') and have_m32 + v4l2_ctl_32_time64 = executable('v4l2-ctl-32-time64', + v4l2_ctl_sources, + install : true, + c_args : v4l2_ctl_32_c_cpp_args, + cpp_args : v4l2_ctl_32_time64_c_cpp_args, + link_args : v4l2_ctl_32_link_args, + include_directories : v4l2_ctl_incdir) +endif
