diff --git a/srcpkgs/igt-gpu-tools/patches/musl.patch b/srcpkgs/igt-gpu-tools/patches/musl.patch
index 0615cf9e1ad..1c1335162e5 100644
--- a/srcpkgs/igt-gpu-tools/patches/musl.patch
+++ b/srcpkgs/igt-gpu-tools/patches/musl.patch
@@ -1,4 +1,4 @@
-diff --git benchmarks/gem_syslatency.c benchmarks/gem_syslatency.c
+diff --git a/benchmarks/gem_syslatency.c b/benchmarks/gem_syslatency.c
 index 7671dc4..3ac9544 100644
 --- a/benchmarks/gem_syslatency.c
 +++ b/benchmarks/gem_syslatency.c
@@ -15,7 +15,7 @@ index 7671dc4..3ac9544 100644
  
  static volatile int done;
  
-diff --git lib/igt_aux.c lib/igt_aux.c
+diff --git a/lib/igt_aux.c b/lib/igt_aux.c
 index 578f857..3e98cf0 100644
 --- a/lib/igt_aux.c
 +++ b/lib/igt_aux.c
@@ -40,7 +40,7 @@ index 578f857..3e98cf0 100644
  /**
   * SECTION:igt_aux
   * @short_description: Auxiliary libraries and support functions
-diff --git lib/igt_aux.h lib/igt_aux.h
+diff --git a/lib/igt_aux.h b/lib/igt_aux.h
 index 04d2290..a0ada9e 100644
 --- a/lib/igt_aux.h
 +++ b/lib/igt_aux.h
@@ -53,7 +53,7 @@ index 04d2290..a0ada9e 100644
  
  /* auxialiary igt helpers from igt_aux.c */
  /* generally useful helpers */
-diff --git lib/igt_eld.c lib/igt_eld.c
+diff --git a/lib/igt_eld.c b/lib/igt_eld.c
 index 3d7fd4d..d51774b 100644
 --- a/lib/igt_eld.c
 +++ b/lib/igt_eld.c
@@ -65,7 +65,7 @@ index 3d7fd4d..d51774b 100644
  
  #include "igt_core.h"
  #include "igt_eld.h"
-diff --git lib/igt_halffloat.c lib/igt_halffloat.c
+diff --git a/lib/igt_halffloat.c b/lib/igt_halffloat.c
 index 08ab05f..7d6a6e6 100644
 --- a/lib/igt_halffloat.c
 +++ b/lib/igt_halffloat.c
@@ -78,7 +78,7 @@ index 08ab05f..7d6a6e6 100644
  #pragma GCC push_options
  #pragma GCC target("f16c")
  
-diff --git lib/igt_x86.c lib/igt_x86.c
+diff --git a/lib/igt_x86.c b/lib/igt_x86.c
 index 6ac700d..ddf5edd 100644
 --- a/lib/igt_x86.c
 +++ b/lib/igt_x86.c
@@ -91,7 +91,7 @@ index 6ac700d..ddf5edd 100644
  #pragma GCC push_options
  #pragma GCC target("sse4.1")
  #pragma GCC diagnostic ignored "-Wpointer-arith"
-diff --git lib/signal_compat.h lib/signal_compat.h
+diff --git a/lib/signal_compat.h b/lib/signal_compat.h
 new file mode 100644
 index 0000000..acae648
 --- /dev/null
@@ -101,7 +101,7 @@ index 0000000..acae648
 +#define SIGEV_NONE      1       /* other notification: meaningless */
 +#define SIGEV_THREAD    2       /* deliver via thread creation */
 +#define SIGEV_THREAD_ID 4       /* deliver to thread */
-diff --git tests/drm_read.c tests/drm_read.c
+diff --git a/tests/drm_read.c b/tests/drm_read.c
 index cfb1c04..18be922 100644
 --- a/tests/drm_read.c
 +++ b/tests/drm_read.c
@@ -114,7 +114,7 @@ index cfb1c04..18be922 100644
  
  		/* One event should wake all threads as none consume */
  		generate_event(w.fd, pipe);
-diff --git tests/kms_hdmi_inject.c tests/kms_hdmi_inject.c
+diff --git a/tests/kms_hdmi_inject.c b/tests/kms_hdmi_inject.c
 index 8c0d133..f272418 100644
 --- a/tests/kms_hdmi_inject.c
 +++ b/tests/kms_hdmi_inject.c
@@ -127,7 +127,7 @@ index 8c0d133..f272418 100644
  #include "igt.h"
  #include "igt_edid.h"
  #include "igt_eld.h"
-diff --git tests/kms_sysfs_edid_timing.c tests/kms_sysfs_edid_timing.c
+diff --git a/tests/kms_sysfs_edid_timing.c b/tests/kms_sysfs_edid_timing.c
 index 1201388..e75c7e9 100644
 --- a/tests/kms_sysfs_edid_timing.c
 +++ b/tests/kms_sysfs_edid_timing.c
@@ -139,7 +139,7 @@ index 1201388..e75c7e9 100644
  #include <sys/stat.h>
  
  #define THRESHOLD_PER_CONNECTOR	10
-diff --git tests/i915/gem_close_race.c tests/i915/gem_close_race.c
+diff --git a/tests/i915/gem_close_race.c b/tests/i915/gem_close_race.c
 index 57e0048..ad5f504 100644
 --- a/tests/i915/gem_close_race.c
 +++ b/tests/i915/gem_close_race.c
@@ -156,7 +156,7 @@ index 57e0048..ad5f504 100644
  
  static void selfcopy(int fd, uint32_t handle, int loops)
  {
-diff --git tests/i915/i915_pm_rpm.c tests/i915/i915_pm_rpm.c
+diff --git a/tests/i915/i915_pm_rpm.c b/tests/i915/i915_pm_rpm.c
 index e2c7ba2..08e44b7 100644
 --- a/tests/i915/i915_pm_rpm.c
 +++ b/tests/i915/i915_pm_rpm.c
@@ -168,7 +168,7 @@ index e2c7ba2..08e44b7 100644
  #include <sys/ioctl.h>
  #include <sys/mman.h>
  #include <sys/types.h>
-diff --git tests/panfrost_submit.c tests/panfrost_submit.c
+diff --git a/tests/panfrost_submit.c b/tests/panfrost_submit.c
 index 13ce85b..ceb2e6d 100644
 --- a/tests/panfrost_submit.c
 +++ b/tests/panfrost_submit.c