diff --git a/srcpkgs/igt-gpu-tools/patches/musl.patch b/srcpkgs/igt-gpu-tools/patches/musl.patch index bf0450bab9b..aaaa8c71ed6 100644 --- a/srcpkgs/igt-gpu-tools/patches/musl.patch +++ b/srcpkgs/igt-gpu-tools/patches/musl.patch @@ -139,63 +139,6 @@ index 1201388..e75c7e9 100644 #include #define THRESHOLD_PER_CONNECTOR 10 -diff --git tools/aubdump.c tools/aubdump.c -index 00e1971..af894fe 100644 ---- tools/aubdump.c -+++ tools/aubdump.c -@@ -42,6 +42,12 @@ - #include "intel_aub.h" - #include "intel_chipset.h" - -+#ifdef __GLIBC__ -+typedef unsigned long request_t; -+#else -+typedef int request_t; -+#endif -+ - #ifndef ARRAY_SIZE - #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) - #endif -@@ -226,10 +232,10 @@ static const uint32_t video_context_init[GEN8_LR_CONTEXT_OTHER_SIZE / - }; - - static int close_init_helper(int fd); --static int ioctl_init_helper(int fd, unsigned long request, ...); -+static int ioctl_init_helper(int fd, request_t request, ...); - - static int (*libc_close)(int fd) = close_init_helper; --static int (*libc_ioctl)(int fd, unsigned long request, ...) = ioctl_init_helper; -+static int (*libc_ioctl)(int fd, request_t request, ...) = ioctl_init_helper; - - static int drm_fd = -1; - static char *filename = NULL; -@@ -856,7 +862,7 @@ relocate_bo(struct bo *bo, const struct drm_i915_gem_execbuffer2 *execbuffer2, - } - - static int --gem_ioctl(int fd, unsigned long request, void *argp) -+gem_ioctl(int fd, request_t request, void *argp) - { - int ret; - -@@ -1150,7 +1156,7 @@ maybe_init(void) - DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2) - - int --ioctl(int fd, unsigned long request, ...) -+ioctl(int fd, request_t request, ...) - { - va_list args; - void *argp; -@@ -1290,7 +1296,7 @@ close_init_helper(int fd) - } - - static int --ioctl_init_helper(int fd, unsigned long request, ...) -+ioctl_init_helper(int fd, request_t request, ...) - { - va_list args; - void *argp; diff --git tests/i915/gem_close_race.c tests/i915/gem_close_race.c index 57e0048..ad5f504 100644 --- tests/i915/gem_close_race.c diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 7aca4faf89e..64cd2d3f1dd 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -1,12 +1,12 @@ # Template file for 'igt-gpu-tools' pkgname=igt-gpu-tools -version=1.24 -revision=3 +version=1.25 +revision=1 build_style=meson configure_args="-Db_ndebug=false -Db_lto=false" # b_lto=true makes the build hang at a random point hostmakedepends="pkg-config flex peg python3-docutils gtk-doc" -makedepends="libdrm-devel libkmod-devel procps-ng-devel libunwind-devel +makedepends="libdrm-devel libkmod-devel liboping-devel procps-ng-devel libunwind-devel elfutils-devel pixman-devel valgrind-devel cairo-devel xmlrpc-c-devel gsl-devel alsa-lib-devel json-c-devel libXrandr-devel" short_desc="Tools for development and testing of the DRM drivers" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="MIT" homepage="https://gitlab.freedesktop.org/drm/igt-gpu-tools" distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" -checksum=57357c72feeafc923c9cfd2d1234bd80e120fc7cc6099eac81158ec351a821bf +checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11 lib32disabled=yes archs="i686* x86_64*"