x11-apps/igt-gpu-tools: sync with ::gentoo updated musl support

Closes: https://github.com/gentoo/musl/pull/357
Closes: https://github.com/gentoo/musl/issues/355

Signed-off-by: Jory Pratt <anarchy@gentoo.org>

5 files changed, 87 insertions, 55 deletions

diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index da385bc2..cdfc2905 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1 +1 @@
-DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
+DIST igt-gpu-tools-1.25.tar.xz 1425652 BLAKE2B 1dd17e8542c126d356478acd07344d8732013a24fd180064d6f2277be76170924e7031fd2529b2aa054b40d5093d9cd95271e156bc6b97a75158c84de142f1ba SHA512 a24ee46092241da26fc2dac2b9b54c9f16f7a408c8740c9c7209e876929e2908a36261ba258ca4a4a4e4a21c1e9c919457bf98d514f81d8b7dbfcf5f89a74daf
diff --git a/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.24-musl.patch b/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.25-musl.patch
index 21227257..adb676be 100644
--- a/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.24-musl.patch
+++ b/x11-apps/igt-gpu-tools/files/0001-igt-gpu-tools-1.25-musl.patch
@@ -114,56 +114,59 @@
  
  #define THRESHOLD_PER_CONNECTOR	10
 
---- a/tools/aubdump.c
-+++ b/tools/aubdump.c
-@@ -226,10 +226,10 @@
- };
- 
- static int close_init_helper(int fd);
--static int ioctl_init_helper(int fd, unsigned long request, ...);
-+static int ioctl_init_helper(int fd, int 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, int request, ...) = ioctl_init_helper;
- 
- static int drm_fd = -1;
- static char *filename = NULL;
-@@ -856,7 +856,7 @@
- }
+--- a/tests/i915/gem_close_race.c
++++ b/tests/i915/gem_close_race.c
+@@ -42,6 +42,10 @@
+ #include <sys/syscall.h>
+ #include "drm.h"
  
- static int
--gem_ioctl(int fd, unsigned long request, void *argp)
-+gem_ioctl(int fd, int request, void *argp)
- {
- 	int ret;
++#ifndef __GLIBC__
++#include "signal_compat.h"
++#endif
++
+ #define OBJECT_SIZE (256 * 1024)
  
-@@ -1150,7 +1150,7 @@
-     DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER2, struct drm_i915_gem_execbuffer2)
+ #define COPY_BLT_CMD		(2<<29|0x53<<22|0x6)
+@@ -51,7 +55,7 @@
+ static uint32_t devid;
+ static bool has_64bit_relocations;
  
- int
--ioctl(int fd, unsigned long request, ...)
-+ioctl(int fd, int request, ...)
+-#define sigev_notify_thread_id _sigev_un._tid
++#define sigev_notify_thread_id sigev_notify_function
+ 
+ static void selfcopy(int fd, uint32_t handle, int loops)
  {
- 	va_list args;
- 	void *argp;
-@@ -1290,7 +1290,7 @@
- }
+
+--- a/tests/panfrost_submit.c
++++ b/tests/panfrost_submit.c
+@@ -68,7 +68,7 @@
+ static void check_fb(int fd, struct panfrost_bo *bo)
+ {
+         int gpu_prod_id = igt_panfrost_get_param(fd, DRM_PANFROST_PARAM_GPU_PROD_ID);
+-        __uint32_t *fbo;
++	uint32_t *fbo;
+         int i;
  
- static int
--ioctl_init_helper(int fd, unsigned long request, ...)
-+ioctl_init_helper(int fd, int request, ...)
+         fbo = bo->map;
+
+--- a/tests/kms_atomic.c
++++ b/tests/kms_atomic.c
+@@ -683,7 +683,6 @@
  {
- 	va_list args;
- 	void *argp;
+ 	int timeline, fence_fd;
+ 	void *map;
+-	const ptrdiff_t PAGE_SIZE = sysconf(_SC_PAGE_SIZE);
+ 	uint64_t old_mode_id = pipe->values[IGT_CRTC_MODE_ID];
+ 
+ 	igt_require_sw_sync();
 
 --- a/lib/igt_eld.c
 +++ b/lib/igt_eld.c
-@@ -29,6 +29,7 @@
- #include <stdint.h>
- #include <stdio.h>
- #include <string.h>
-+#include <limits.h>
+@@ -26,6 +26,7 @@
+ #include "config.h"
  
- #include "igt_core.h"
- #include "igt_eld.h"
\ No newline at end of file
+ #include <dirent.h>
++#include <limits.h>
+ #include <errno.h>
+ #include <glob.h>
+ #include <stdint.h>
diff --git a/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
new file mode 100644
index 00000000..689dca41
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/files/1.25-python-3.9.patch
@@ -0,0 +1,25 @@
+manual backport of upstream commit
+https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/201da47cb57b8fadd9bc45be16b82617b32a2c01
+
+--- a/docs/reference/igt-gpu-tools/generate_description_xml.py
++++ b/docs/reference/igt-gpu-tools/generate_description_xml.py
+@@ -4,7 +4,7 @@ import re
+ import sys
+ import os.path
+ import subprocess
+-import xml.etree.cElementTree as ET
++import xml.etree.ElementTree as ET
+ 
+ from collections import namedtuple
+ 
+--- a/lib/i915/perf-configs/perf-codegen.py
++++ b/lib/i915/perf-configs/perf-codegen.py
+@@ -26,7 +26,7 @@ import os
+ import sys
+ import textwrap
+ 
+-import xml.etree.cElementTree as et
++import xml.etree.ElementTree as et
+ 
+ import codegen
+ 
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
index 414e99f2..b6dd9364 100644
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.25.ebuild
@@ -20,13 +20,14 @@ else
 fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+IUSE="chamelium doc man overlay runner tests unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
 REQUIRED_USE="
 	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
 	overlay? (
 		video_cards_intel
 		|| ( X xv )
 	)
+	doc? ( tests )
 "
 RESTRICT="test"
 
@@ -71,8 +72,10 @@ DEPEND="${RDEPEND}
 		sys-devel/flex
 	)
 "
+
 PATCHES=(
-	"${FILESDIR}"/0001-${PN}-1.24-musl.patch
+	"${FILESDIR}/${PV}-python-3.9.patch"
+	"${FILESDIR}"/0001-${PN}-1.25-musl.patch
 )
 
 src_prepare() {
@@ -91,16 +94,16 @@ src_configure() {
 	use overlay && use X && overlay_backends+="x,"
 
 	local emesonargs=(
-		$(meson_feature chamelium build_chamelium)
-		$(meson_feature doc build_docs)
-		$(meson_feature man build_man)
-		$(meson_feature overlay build_overlay)
-		$(meson_feature runner build_runner)
-		$(meson_feature doc build_tests) # Test build is required for docs
-		$(meson_feature valgrind with_valgrind)
-		$(meson_feature unwind with_libunwind)
+		$(meson_feature chamelium)
+		$(meson_feature doc docs)
+		$(meson_feature man)
+		$(meson_feature overlay)
+		$(meson_feature runner)
+		$(meson_feature tests)
+		$(meson_feature valgrind)
+		$(meson_feature unwind libunwind)
 		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
+		-Dlibdrm_drivers=${gpus%?}
 	)
 	meson_src_configure
 }
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index 887359bb..591109fd 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -10,6 +10,7 @@
  <flag name="man">Build and install man pages</flag>
  <flag name="overlay">Build the intel-gpu-overlay utility</flag>
  <flag name="runner">Build the test runner</flag>
+ <flag name="tests">Enable tests</flag>
  <flag name="valgrind">Support valgrind annotations</flag>
  <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
  <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>