From patchwork Mon Nov 27 20:09:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deborah Brouwer X-Patchwork-Id: 747693 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="f4MKEOJQ" Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E055D6D for ; Mon, 27 Nov 2023 12:09:55 -0800 (PST) Received: from mz550.lan (ec2-34-240-57-77.eu-west-1.compute.amazonaws.com [34.240.57.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dbrouwer) by madras.collabora.co.uk (Postfix) with ESMTPSA id 167226606F5E; Mon, 27 Nov 2023 20:09:52 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701115793; bh=NQw6hWkTzgbIzRPBJYJS2icgbBMo3nbXz1xGV0Bvdsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f4MKEOJQ3VqrKtEkVKqRnwAu8pR3LOHL+KOjvjG4bemvMKQEhnQMgtq6h+5cC/zZP lPF9cBfLYvGfz4vghQvvbIb7iErPA1dylhK+X78dYyZwkoLTyvg7OlqzSQAk1PXnlg BEaM3gZMQ0ZAxYzczUTmLplwxobH0M6cml+JVQhSsNbA/xx9/IenqIlkHUfd2A0HH1 vGwpP6b4s7uRBTCBZG0nnbqQFuLNT04CqtECPHECsrmKAgupgEp1dc3KiJLIxvcI2l oRMaLndzQFsUNWeUM21FWtWBzKtZbszvUJF5CJ6Isg1O3kbq9d2Ml44YQPyG5/VJuA a0Iv7wuRcHK1Q== From: Deborah Brouwer To: linux-media@vger.kernel.org Cc: hverkuil-cisco@xs4all.nl, Deborah Brouwer Subject: [PATCH 3/4] v4l2-tracer: stop auto-generating files with meson Date: Mon, 27 Nov 2023 12:09:13 -0800 Message-ID: <89528845ea8ea73f838be1ef8fe9e20a5d462e1b.1701114910.git.deborah.brouwer@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 --- utils/v4l2-tracer/meson.build | 55 ++--------------------------------- 1 file changed, 3 insertions(+), 52 deletions(-) diff --git a/utils/v4l2-tracer/meson.build b/utils/v4l2-tracer/meson.build index 1b9ba78b..d30e2eae 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,