mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 00:04:06 -09:00
package/igt-gpu-tools: bump version to 2.1
Release notes: https://lists.x.org/archives/xorg-announce/2025-June/003614.html Removed patch which is included in this release. Switched _SITE to tarball and added sha512 hash, both provided by upstream. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
committed by
Julien Olivain
parent
14272869eb
commit
bab8ed7b0b
@@ -1,66 +0,0 @@
|
||||
From 17a30d4dbd60c644244d5bc7355eeaa221aaa820 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Thu, 2 Jan 2025 14:16:47 +0100
|
||||
Subject: [PATCH] lib/igt_aux.c: since procps-ng 4.0.5, PIDS_VAL() takes 3
|
||||
arguments, not 4
|
||||
|
||||
Unfortunately, the API of procps-ng has changed between procps-ng
|
||||
4.0.4 and procps-ng 4.0.5, with the PIDS_VAL() macro changing in
|
||||
upstream commit
|
||||
https://gitlab.com/procps-ng/procps/-/commit/967fdcfb06e20aad0f31073474cb94545c9bdea5.
|
||||
|
||||
This API breakage has been reported upstream as of
|
||||
https://gitlab.com/procps-ng/procps/-/issues/366, but in the mean
|
||||
time, the build of igt-gpu-tools breaks with:
|
||||
|
||||
../lib/igt_aux.c:1358:78: error: macro "PIDS_VAL" passed 4 arguments, but takes just 3
|
||||
|
||||
We fix this by detecting the version of the libproc2 library, and
|
||||
adjusting accordingly how PIDS_VAL() gets used.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Upstream: https://lists.freedesktop.org/archives/igt-dev/2025-January/083809.html
|
||||
---
|
||||
lib/igt_aux.c | 7 +++++++
|
||||
meson.build | 3 +++
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/lib/igt_aux.c b/lib/igt_aux.c
|
||||
index 3407cc4f2..f5bf48da6 100644
|
||||
--- a/lib/igt_aux.c
|
||||
+++ b/lib/igt_aux.c
|
||||
@@ -1358,10 +1358,17 @@ static bool get_process_ids(struct igt_process *prcs)
|
||||
prcs->comm = NULL;
|
||||
prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY);
|
||||
if (prcs->stack) {
|
||||
+#if defined(HAVE_LIBPROC2_POST_4_0_5_API)
|
||||
+ prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack);
|
||||
+ prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack);
|
||||
+ prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack);
|
||||
+ prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack);
|
||||
+#else
|
||||
prcs->tid = PIDS_VAL(EU_PID, s_int, prcs->stack, prcs->info);
|
||||
prcs->euid = PIDS_VAL(EU_EUID, s_int, prcs->stack, prcs->info);
|
||||
prcs->egid = PIDS_VAL(EU_EGID, s_int, prcs->stack, prcs->info);
|
||||
prcs->comm = PIDS_VAL(EU_CMD, str, prcs->stack, prcs->info);
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
return prcs->tid != 0;
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 8b2a2a64a..f3e645c4d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -139,6 +139,9 @@ if libprocps.found()
|
||||
config.set('HAVE_LIBPROCPS', 1)
|
||||
elif libproc2.found()
|
||||
config.set('HAVE_LIBPROC2', 1)
|
||||
+ if libproc2.version().version_compare('>= 4.0.5')
|
||||
+ config.set('HAVE_LIBPROC2_POST_4_0_5_API', 1)
|
||||
+ endif
|
||||
else
|
||||
error('Either libprocps or libproc2 is required')
|
||||
endif
|
||||
--
|
||||
2.47.1
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
# Locally calculated from download
|
||||
sha256 de6e9443d569e76333ec6c8ffc53937b6831224161fe69bf2f07efad3bd0e04a igt-gpu-tools-0ee4074685c1e184f2d3612ea6eb4d126f9a2e23.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2025-June/003614.html
|
||||
sha256 bf72beff71093db692f386c9359b557dfa8e8c45250439c952564b1b6fe343f8 igt-gpu-tools-2.1.tar.xz
|
||||
sha512 401e9912044e2d37cc581cf01ba03b4d14c2e685e28c4764cb544c481291c6ec36cb90beaadb51537ba7cc8dc33d4aa7139dad91b4484ae0b718cbe19c1a987e igt-gpu-tools-2.1.tar.xz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 1b7e266857b05808660f42369a4a797459d7b7bec7245e378aa28a8db2f213da COPYING
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IGT_GPU_TOOLS_VERSION = 0ee4074685c1e184f2d3612ea6eb4d126f9a2e23
|
||||
IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.bz2
|
||||
IGT_GPU_TOOLS_SITE = https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/$(IGT_GPU_TOOLS_VERSION)
|
||||
IGT_GPU_TOOLS_VERSION = 2.1
|
||||
IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.xz
|
||||
IGT_GPU_TOOLS_SITE = https://www.x.org/releases/individual/app
|
||||
IGT_GPU_TOOLS_LICENSE = MIT
|
||||
IGT_GPU_TOOLS_LICENSE_FILES = COPYING
|
||||
IGT_GPU_TOOLS_INSTALL_STAGING = YES
|
||||
|
||||
Reference in New Issue
Block a user