Thanks, applied as dd6bf4f1b861e0be9876e7ee322f5193e62a6576.

Michael

[sent from post-receive hook]

On Wed, 08 Feb 2023 12:50:01 +0100, Philipp Zabel <[email protected]> 
wrote:
> Signed-off-by: Philipp Zabel <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> 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
> deleted file mode 100644
> index 51df2f0c40d6..000000000000
> --- 
> a/patches/igt-gpu-tools-1.26/0001-lib-meson.build-Fix-underscorify-call.patch
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
> -From: Petri Latvala <[email protected]>
> -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 <[email protected]>
> -Signed-off-by: Petri Latvala <[email protected]>
> -Reviewed-by: José Roberto de Souza <[email protected]>
> ----
> - 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
> deleted file mode 100644
> index 30537838e16d..000000000000
> --- a/patches/igt-gpu-tools-1.26/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-lib-meson.build-Fix-underscorify-call.patch
> diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
> index 1a10a81daa27..22df9ba73e4c 100644
> --- a/rules/igt-gpu-tools.make
> +++ b/rules/igt-gpu-tools.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_IGT_GPU_TOOLS) += igt-gpu-tools
>  #
>  # Paths and names
>  #
> -IGT_GPU_TOOLS_VERSION        := 1.26
> -IGT_GPU_TOOLS_MD5    := 6781293a2c312bb625aa5cbe5506a9bf
> +IGT_GPU_TOOLS_VERSION        := 1.27.1
> +IGT_GPU_TOOLS_MD5    := 62135c26178dc8121e619c4c19d7edcb
>  IGT_GPU_TOOLS                := igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION)
>  IGT_GPU_TOOLS_SUFFIX := tar.xz
>  IGT_GPU_TOOLS_URL    := $(call ptx/mirror, XORG, 
> individual/app/$(IGT_GPU_TOOLS).$(IGT_GPU_TOOLS_SUFFIX))

Reply via email to