mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-29 17:02:56 +02:00
igt-gpu-tools: rebuild for procps-ng-4.0.5_1.
This commit is contained in:
parent
9fb87966af
commit
a972d9b878
3 changed files with 55 additions and 27 deletions
17
srcpkgs/igt-gpu-tools/patches/libproc.patch
Normal file
17
srcpkgs/igt-gpu-tools/patches/libproc.patch
Normal file
|
@ -0,0 +1,17 @@
|
|||
--- a/lib/igt_aux.c
|
||||
+++ b/lib/igt_aux.c
|
||||
@@ -1353,10 +1353,10 @@
|
||||
prcs->comm = NULL;
|
||||
prcs->stack = procps_pids_get(prcs->info, PIDS_FETCH_TASKS_ONLY);
|
||||
if (prcs->stack) {
|
||||
- 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);
|
||||
+ 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);
|
||||
}
|
||||
#endif
|
||||
return prcs->tid != 0;
|
|
@ -14,19 +14,6 @@ index 7e86473e..3156dfc2 100644
|
|||
{
|
||||
struct trace *t, **p;
|
||||
va_list args;
|
||||
diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c
|
||||
index 312c428b..e0740fc1 100644
|
||||
--- a/benchmarks/gem_syslatency.c
|
||||
+++ b/benchmarks/gem_syslatency.c
|
||||
@@ -46,6 +46,8 @@
|
||||
#include <linux/unistd.h>
|
||||
#endif
|
||||
|
||||
+#define sigev_notify_thread_id sigev_notify_function
|
||||
+
|
||||
#include "i915/gem_create.h"
|
||||
#include "i915/gem_ring.h"
|
||||
#include "igt_aux.h"
|
||||
diff --git a/lib/amdgpu/amd_pci_unplug.c b/lib/amdgpu/amd_pci_unplug.c
|
||||
index 078398b5..554f489c 100644
|
||||
--- a/lib/amdgpu/amd_pci_unplug.c
|
||||
|
@ -63,19 +50,6 @@ index 15e30440..9792899d 100644
|
|||
#include <pwd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
diff --git a/lib/igt_aux.h b/lib/igt_aux.h
|
||||
index e734c87b..b626d28c 100644
|
||||
--- a/lib/igt_aux.h
|
||||
+++ b/lib/igt_aux.h
|
||||
@@ -48,7 +48,7 @@
|
||||
# ifndef HAVE_GETTID
|
||||
# define gettid() (pid_t)(syscall(__NR_gettid))
|
||||
# endif
|
||||
-# define sigev_notify_thread_id _sigev_un._tid
|
||||
+# define sigev_notify_thread_id sigev_notify_function
|
||||
#endif
|
||||
|
||||
/* auxialiary igt helpers from igt_aux.c */
|
||||
diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
|
||||
index ed128d24..ebff1ad3 100644
|
||||
--- a/lib/igt_device_scan.c
|
||||
|
@ -308,3 +282,40 @@ index 0faf3fc8..f6bd970e 100644
|
|||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
--- a/lib/igt_aux.h
|
||||
+++ b/lib/igt_aux.h
|
||||
@@ -48,7 +48,9 @@
|
||||
# ifndef HAVE_GETTID
|
||||
# define gettid() (pid_t)(syscall(__NR_gettid))
|
||||
# endif
|
||||
-# define sigev_notify_thread_id _sigev_un._tid
|
||||
+# ifdef __GLIBC__
|
||||
+# define sigev_notify_thread_id _sigev_un._tid
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
/* auxialiary igt helpers from igt_aux.c */
|
||||
--- a/lib/i915/gem_engine_topology.c
|
||||
+++ b/lib/i915/gem_engine_topology.c
|
||||
@@ -693,8 +693,8 @@
|
||||
|
||||
while (len) {
|
||||
struct linux_dirent64 {
|
||||
- ino64_t d_ino;
|
||||
- off64_t d_off;
|
||||
+ ino_t d_ino;
|
||||
+ off_t d_off;
|
||||
unsigned short d_reclen;
|
||||
unsigned char d_type;
|
||||
char d_name[];
|
||||
--- a/tools/i915-perf/i915_perf_recorder.c
|
||||
+++ b/tools/i915-perf/i915_perf_recorder.c
|
||||
@@ -187,7 +187,7 @@
|
||||
}
|
||||
|
||||
static int
|
||||
-circular_buffer_seek(void *c, off64_t *offset, int whence)
|
||||
+circular_buffer_seek(void *c, off_t *offset, int whence)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'igt-gpu-tools'
|
||||
pkgname=igt-gpu-tools
|
||||
version=1.28
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=meson
|
||||
configure_args="-Db_ndebug=false -Ddocs=disabled"
|
||||
hostmakedepends="pkg-config flex peg python3-docutils"
|
||||
|
|
Loading…
Add table
Reference in a new issue