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-tracer: stop auto-generating files with meson Author: Deborah Brouwer <deborah.brou...@collabora.com> Date: Fri Dec 1 09:13:32 2023 -0800 Stop using meson to run the v4l2-tracer autogeneration script. Instead just handle these autogenerated files like any other file source. Signed-off-by: Deborah Brouwer <deborah.brou...@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> utils/v4l2-tracer/meson.build | 55 +++---------------------------------------- 1 file changed, 3 insertions(+), 52 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=4e4625076f9fc68d1b41f52ddb975d5aafced972 diff --git a/utils/v4l2-tracer/meson.build b/utils/v4l2-tracer/meson.build index 1b9ba78bb2ce..d30e2eaefe4f 100644 --- a/utils/v4l2-tracer/meson.build +++ b/utils/v4l2-tracer/meson.build @@ -2,48 +2,6 @@ if not dep_jsonc.found() subdir_done() endif -# Generated sources - -v4l2_tracer_gen = files('v4l2-tracer-gen.pl') - -# Don't reorder the inputs The order of the input headers matters -v4l2_tracer_gen_inputs = files( - '..' / '..' / 'include' / 'linux' / 'v4l2-controls.h', - '..' / '..' / 'include' / 'linux' / 'videodev2.h', - '..' / '..' / 'include' / 'linux' / 'media.h', - '..' / '..' / 'include' / 'linux' / 'v4l2-common.h', -) - -v4l2_tracer_gen_common_sources = custom_target('v4l2-tracer-gen-common-sources', - input : v4l2_tracer_gen_inputs, - output : ['v4l2-tracer-info-gen.h'], - command : [ - v4l2_tracer_gen, - '-o', meson.current_build_dir(), - '-t', 'common', - '@INPUT@', - ]) - -v4l2_tracer_gen_retrace_sources = custom_target('v4l2-tracer-gen-retrace-sources', - input : v4l2_tracer_gen_inputs, - output : ['retrace-gen.cpp', 'retrace-gen.h'], - command : [ - v4l2_tracer_gen, - '-o', meson.current_build_dir(), - '-t', 'retrace', - '@INPUT@', - ]) - -v4l2_tracer_gen_trace_sources = custom_target('v4l2-tracer-gen-trace-sources', - input : v4l2_tracer_gen_inputs, - output : ['trace-gen.cpp', 'trace-gen.h'], - command : [ - v4l2_tracer_gen, - '-o', meson.current_build_dir(), - '-t', 'trace', - '@INPUT@', - ]) - # V4L2 tracer library libv4l2tracer_sources = files( @@ -51,15 +9,11 @@ libv4l2tracer_sources = files( 'media-info.cpp', 'trace-helper.cpp', 'trace.cpp', + 'trace-gen.cpp', 'v4l2-info.cpp', 'v4l2-tracer-common.cpp', ) -libv4l2tracer_sources += [ - v4l2_tracer_gen_common_sources, - v4l2_tracer_gen_trace_sources, -] - libv4l2tracer_deps = [ dep_jsonc, dep_libdl, @@ -84,15 +38,12 @@ v4l2_tracer_sources = files( 'retrace-helper.cpp', 'retrace.cpp', 'v4l2-info.cpp', + 'trace-gen.cpp', + 'retrace-gen.cpp', 'v4l2-tracer-common.cpp', 'v4l2-tracer.cpp', ) -v4l2_tracer_sources += [ - v4l2_tracer_gen_common_sources, - v4l2_tracer_gen_retrace_sources, -] - v4l2_tracer_deps = [ dep_jsonc, dep_librt, _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits