diff mbox series

[20/30] igt-gpu-tools: upgrade 2.3 -> 2.4

Message ID 20260616191628.2014553-20-alex.kanavin@gmail.com
State New
Headers show
Series [01/30] gstreamer1.0: disable an intermittently failing test | expand

Commit Message

Alexander Kanavin June 16, 2026, 7:16 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-meson.build-do-not-hardcode-the-build-directory-.patch | 7 +++----
 .../{igt-gpu-tools_2.3.bb => igt-gpu-tools_2.4.bb}         | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename meta/recipes-graphics/igt-gpu-tools/{igt-gpu-tools_2.3.bb => igt-gpu-tools_2.4.bb} (93%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
index 7ff8aa22a9..d8422633cc 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch
@@ -1,4 +1,4 @@ 
-From 27fd94beadfc29ea4ad82f660dbdb2540d0b6b97 Mon Sep 17 00:00:00 2001
+From ebafc97afab5bcd71ca1d2013aed3b09b12e1c35 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Thu, 18 Dec 2025 15:45:11 +0100
 Subject: [PATCH] lib/meson.build: do not hardcode the build directory into the
@@ -25,7 +25,6 @@  and them IGT_IMGDIR is used thusly in lib/igt_core.h:
 #define igt_fopen_data(filename) \
         __igt_fopen_data(IGT_SRCDIR, IGT_DATADIR, IGT_IMGDIR, filename)
 
-
 Upstream-Status: Inappropriate [hack patching in a bogus dir; issue reported at https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/190]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 ---
@@ -33,10 +32,10 @@  Signed-off-by: Alexander Kanavin <alex@linutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/meson.build b/lib/meson.build
-index d0487fb3c..f6452e970 100644
+index 5c4829345..d28c95d99 100644
 --- a/lib/meson.build
 +++ b/lib/meson.build
-@@ -292,7 +292,7 @@ foreach f: lib_sources
+@@ -301,7 +301,7 @@ foreach f: lib_sources
  	    '-DIGT_DATADIR="@0@"'.format(join_paths(prefix, datadir)),
  	    '-DIGT_SRCDIR="@0@"'.format(srcdir),
  	    '-DIGT_LOG_DOMAIN="@0@"'.format(f.split('.')[0]),
diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.4.bb
similarity index 93%
rename from meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb
rename to meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.4.bb
index c92d10c617..32a3a3cc48 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.3.bb
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_2.4.bb
@@ -9,13 +9,13 @@  LICENSE = "MIT"
 
 inherit meson pkgconfig
 
-SRCREV = "2d7ec9a36c550c48af4bdd6e748f6753369ab8ff"
+SRCREV = "e6b603e4984e4ce30fe1cc2705734d0f130e0550"
 
 SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master;tag=v${PV} \
            file://0001-lib-meson.build-do-not-hardcode-the-build-directory-.patch \
            "
 
-DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"
+DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native pciutils jansson"
 RDEPENDS:${PN} += "bash perl"
 RDEPENDS:${PN}-tests += "bash"