diff --git a/fix-procps-ng-4.0.5.patch b/fix-procps-ng-4.0.5.patch new file mode 100644 index 0000000..8dac21d --- /dev/null +++ b/fix-procps-ng-4.0.5.patch @@ -0,0 +1,39 @@ +diff -ruNp a/meson.build b/meson.build +--- a/meson.build ++++ b/meson.build +@@ -135,10 +135,14 @@ pciaccess = dependency('pciaccess', vers + libkmod = dependency('libkmod') + libprocps = dependency('libprocps', required : false) + libproc2 = dependency('libproc2', required : false) ++libproc21 = dependency('libproc2', required : false, version : '>=4.0.5') + if libprocps.found() + config.set('HAVE_LIBPROCPS', 1) + elif libproc2.found() + config.set('HAVE_LIBPROC2', 1) ++ if libproc21.found() ++ config.set('HAVE_LIBPROC21', 1) ++ endif + else + error('Either libprocps or libproc2 is required') + endif +diff -ruNp a/lib/igt_aux.c b/lib/igt_aux.c +--- a/lib/igt_aux.c ++++ b/lib/igt_aux.c +@@ -1358,10 +1358,17 @@ static bool get_process_ids(struct igt_p + prcs->comm = NULL; + prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY); + if (prcs->stack) { ++#ifdef HAVE_LIBPROC21 ++ 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/igt-gpu-tools-1.29.tar.xz b/igt-gpu-tools-1.29.tar.xz deleted file mode 100644 index 47947b0..0000000 --- a/igt-gpu-tools-1.29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0fe0d0f088cb50090b212f28b8960fb1e6160c681f5bea0654973aaa9909d8f -size 2944444 diff --git a/igt-gpu-tools-1.29.tar.xz.sig b/igt-gpu-tools-1.29.tar.xz.sig deleted file mode 100644 index 3f826cb..0000000 Binary files a/igt-gpu-tools-1.29.tar.xz.sig and /dev/null differ diff --git a/igt-gpu-tools-1.30.tar.xz b/igt-gpu-tools-1.30.tar.xz new file mode 100644 index 0000000..f9cea5d --- /dev/null +++ b/igt-gpu-tools-1.30.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b29f969d54cc620756f75517971fb3197e1488eec60af720a18a0ba7ab541ab1 +size 3079568 diff --git a/igt-gpu-tools-1.30.tar.xz.sig b/igt-gpu-tools-1.30.tar.xz.sig new file mode 100644 index 0000000..7f74b70 Binary files /dev/null and b/igt-gpu-tools-1.30.tar.xz.sig differ diff --git a/intel-gpu-tools.changes b/intel-gpu-tools.changes index aa90cf8..058b28c 100644 --- a/intel-gpu-tools.changes +++ b/intel-gpu-tools.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Jan 2 10:24:19 UTC 2025 - munix9@googlemail.com + +- Update to version 1.30: + * General changes: + - New meson options xe_eudebug and vmtb. + * Library changes: + - Added PantherLake (PTL) support, unified PCI IDs into one + common header pciids.h (Ngai-Mint Kwan) + - Added BMG support for OA (Observability Architecture) for Xe driver. + (José Roberto de Souza) + - Added support for Xe3 platforms in GPGPU shader. (Andrzej Hajda) + - Added 6k resolution support for a single CRTC. (Jeevan B) + - Added support for MTL platform in GPGPU compute. (Nishit Sharma) + * Runner changes: + - Set option PRUNE_KEEP_ALL as default. (Kamil Konieczny) + - Allow to dynamically ignore dmesg warn messages when generating + results, usefull when driver is using kernel fault injection. + (Kamil Konieczny). + * Tools changes: + - New power tool for power/energy measurement. (Ville Syrjälä) + - New VM Testbench (VMTB) - SR-IOV Virtual Machine testing tool. + (Adam Miszczak) + - Fixes in amd_hdmi_compliance. (Stylon Wang and Wayne Lin) + - Fixes in intel_reg. (Lucas De Marchi) + * And many other bug fixes, improvements, cleanups and new tests. + +- Add fix-procps-ng-4.0.5.patch: Fix build with procps-ng >= 4.0.5 + (https://gitlab.com/procps-ng/procps/-/issues/332) + ------------------------------------------------------------------- Sat Oct 12 05:40:05 UTC 2024 - Tejas Guruswamy diff --git a/intel-gpu-tools.spec b/intel-gpu-tools.spec index 5b74005..15ff92d 100644 --- a/intel-gpu-tools.spec +++ b/intel-gpu-tools.spec @@ -1,7 +1,7 @@ # # spec file for package intel-gpu-tools # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: intel-gpu-tools -Version: 1.29 +Version: 1.30 Release: 0 Summary: Collection of tools for development and testing of the Intel DRM driver License: MIT @@ -25,6 +25,8 @@ Group: Development/Tools/Other URL: https://xorg.freedesktop.org/ Source0: https://xorg.freedesktop.org/releases/individual/app/igt-gpu-tools-%{version}.tar.xz Source1: https://xorg.freedesktop.org/releases/individual/app/igt-gpu-tools-%{version}.tar.xz.sig +# PATCH-FIX-OPENSUSE fix-procps-ng-4.0.5.patch https://gitlab.com/procps-ng/procps/-/issues/332 +Patch0: fix-procps-ng-4.0.5.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flex @@ -74,7 +76,7 @@ Requires: %{name} = %{version} Development files and library headers for %{name} %prep -%autosetup -n igt-gpu-tools-%{version} +%autosetup -n igt-gpu-tools-%{version} -p1 %build # Tests fail on x86_64 with -z now @@ -91,6 +93,7 @@ ninja -C %{_vpath_builddir} igt-gpu-tools-doc sed -i 's#/usr/bin/env python3#/usr/bin/python3#' \ %{buildroot}%{_bindir}/{code_cov_gather_on_test,intel-gfx-fw-info} +%fdupes %{buildroot}%{_includedir} %fdupes %{buildroot}%{_libexecdir} # These are only useful with the full source tree