Re: [ptxdist] [APPLIED] igt-gpu-tools: fix build with meson 0.60

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 981a6f88eea3565e8d700fa6dbce146fa3553fc0.

Michael

[sent from post-receive hook]

On Sun, 30 Jan 2022 16:49:31 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Backport igt-gpu-tools commit 963917a35654 ("lib/meson.build: Fix
> underscorify call") to fix build with recent Meson.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20211215100018.3352980-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
> new file mode 100644
> index 000000000000..51df2f0c40d6
> --- /dev/null
> +++ b/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
> @@ -0,0 +1,36 @@
> +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
> +From: Petri Latvala <petri.latvala@intel.com>
> +Date: Thu, 28 Oct 2021 11:05:31 +0300
> +Subject: [PATCH] lib/meson.build: Fix underscorify call
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +f.underscorify() is correct, f.underscorify(f) is an error that later
> +meson versions don't like at all.
> +
> +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
> +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
> +Cc: Arkadiusz Hiler <arek@hiler.eu>
> +Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> +Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
> +---
> + lib/meson.build | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/lib/meson.build b/lib/meson.build
> +index c3080fc82c29..297b0ad26ee5 100644
> +--- a/lib/meson.build
> ++++ b/lib/meson.build
> +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
> + 
> + lib_intermediates = []
> + foreach f: lib_sources
> +-    name = f.underscorify(f)
> ++    name = f.underscorify()
> +     lib = static_library('igt-' + name,
> + 	[ f, lib_version ],
> + 	include_directories: inc,
> +-- 
> +2.30.2
> +
> diff --git a/patches/igt-gpu-tools-1.26/series b/patches/igt-gpu-tools-1.26/series
> new file mode 100644
> index 000000000000..30537838e16d
> --- /dev/null
> +++ b/patches/igt-gpu-tools-1.26/series
> @@ -0,0 +1 @@
> +0001-lib-meson.build-Fix-underscorify-call.patch

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de