From patchwork Fri Dec 1 17:13:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deborah Brouwer X-Patchwork-Id: 97580 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from sy.mirrors.kernel.org ([147.75.48.161]) by www.linuxtv.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1r975l-006qte-Hp for patchwork@linuxtv.org; Fri, 01 Dec 2023 17:14:18 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 831C2B21239 for ; Fri, 1 Dec 2023 17:14:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4C22B4E1A7; Fri, 1 Dec 2023 17:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="Ip4qIcos" X-Original-To: linux-media@vger.kernel.org Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1760D106 for ; Fri, 1 Dec 2023 09:14:04 -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 23E00660739A; Fri, 1 Dec 2023 17:14:01 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1701450843; bh=NQw6hWkTzgbIzRPBJYJS2icgbBMo3nbXz1xGV0Bvdsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ip4qIcosLvA1vyqXKYLxjwvTOxD3dkX1lAYMViP8rsBXZTow5Zuwl+gBOhepxeAjp jQ//SWOe+oT4zyJBxbsRsgiTtGtZSDBNj/4NKErpoWZk7TfD5c3Vmr7jiLtkGgBkta fzknYWj6vbcqOwXGY9t95vEVqU022Fk99uqV/ewacqB4THZVqW8YH6/t/baWlw1HDP NA4NYvZBauTW5P3Ao1Q1AfdGD9d5E3E1hPq8qFNtN3H/0D6p5tqm17Z2G+CbmUEX5W /3u/OxRaIEIUqZN89DJMQc41wfsNg2K4ucg5swo4vDrIpF2WCwg/13fb7CxP1IPVmQ atfR3n7MahXSg== From: Deborah Brouwer To: linux-media@vger.kernel.org Cc: hverkuil-cisco@xs4all.nl, Deborah Brouwer Subject: [PATCH v3 3/4] v4l2-tracer: stop auto-generating files with meson Date: Fri, 1 Dec 2023 09:13:32 -0800 Message-ID: <275dad8370d058b43d17df6d72c0089fcd8d78d3.1701450544.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 X-LSpam-Score: -4.8 (----) X-LSpam-Report: No, score=-4.8 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3 autolearn=unavailable autolearn_force=no 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,