gentoo auto-resync : 09:12:2024 - 02:07:41

3 files changed, 70 insertions, 1 deletions

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 547629b98f84..b61fbda28322 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,6 +1,7 @@
 AUX 9.0.0-Disable-things-we-don-t-want.patch 5612 BLAKE2B 2890a41155cff6c085789fe29330cbe9f4147cfa6adcade4e3bea94729f8c984fcde89d240977ad81502d7c8945258b323df13464ab00e854c73943ef03960df SHA512 3a00e2c00da613978f830f159634b848cb0ceba2a6f9faf6e1f71fb50d8a0a113038f23b3354745fbb586cc250f62b5645019a2b1f57f5a32408e56b61c07b2f
+AUX 9.0.0-uint.patch 2434 BLAKE2B 1a794373229e8b362c107106e594b7fcab70ee1d119e31b732282b435521f1de35bc7c182e2038619388ee4b63bd8844c250612cee0b225c1488b7ca2933af40 SHA512 8bc04ced2dd02e1b3b0a9b287716e6f7df67c5074b0e02d10530a65f2618660226776ec77a9eacee4c02bc3698bf1d556b9a5a1c9d0dd4e4ea04fb88f15a7f20
 AUX 9999-Disable-things-we-don-t-want.patch 5684 BLAKE2B dd286c692f1c1cbe41814240ced62ebb8c0aabc0e860d942afcf9349019f5172c5cdeb7336fa956138f18aba3999d89a97ce7eeb2712bc3dbb4f03788484c51e SHA512 1d4132d5705c1f2d1ff1cc9d35970af39729f78c7c022d640d14c608a2665e8bc339f2c66bfc85a11030a0ab03860f99990157cc698bdb1e9945a0fc27194328
 DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
-EBUILD mesa-progs-9.0.0.ebuild 2147 BLAKE2B c938f59f98c20b0583f4c47a5e741d2da52e7880f096a451bdd76259439d0618b0f589c6a49f5717feec95fe6b60de4b7e3229c0d04c0b901a2061164aae2bf8 SHA512 63249f5d28627cf32486d1d357051ababb64cedd6fcbb2cb43749ea67ceb07b103a5c5915f8e6ed15dd3607781ddbdaa7f66d93bb58e6a261463932a0a88e74d
+EBUILD mesa-progs-9.0.0.ebuild 2179 BLAKE2B 36932864c85de88d4c5fe2c5564a43593a6d1673d9131cfe75b46021f3cf3475cdb16e034c8089d97667660924062085310352e2942d5325c560594fb34591df SHA512 9efabff43e59d9ddaf78f77046ab2ce1e5e15f914e96cf6cdc083a5f1d1428ff7dcec5468e69d67acb223688d47d8671c5eb6aea7d32683ecffd695763d7ae5d
 EBUILD mesa-progs-9999.ebuild 2089 BLAKE2B 12341e3fea863e19ffea457d41ff8a140646c4cbb62f2ecdef6122a008cfdfd2088915cdeda680fe88009fba05fbe39ed42fa965f0b1c7690359d05c54182952 SHA512 7b3056dccbfdbae4ee552c90f0b3118ec03f940bcf5c6346886adaa3b24887dd0a7f3faf5bf3848a7106bd4b5d54cedc29ba1759e37ee49b11feab79361528a5
 MISC metadata.xml 332 BLAKE2B e04fff442530a88cc9d5601e87b439c2dacf38443bce413174f0bf5923a490140c7f43d8c1808e6011936e4bd77306d6d7e5be4f18d0cfecdd4841f252714a19 SHA512 c1f234a2663a6c51177ee9dcb7b33a94deed4dde8c13b53018b5bc429efe269faae54ac7693608186d939d9e7e493209a450852f2f68310e41422e31836f71ca
diff --git a/x11-apps/mesa-progs/files/9.0.0-uint.patch b/x11-apps/mesa-progs/files/9.0.0-uint.patch
new file mode 100644
index 000000000000..a4e3d693f2ca
--- /dev/null
+++ b/x11-apps/mesa-progs/files/9.0.0-uint.patch
@@ -0,0 +1,67 @@
+From 3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326 Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Thu, 23 Mar 2023 21:18:56 +0000
+Subject: [PATCH] vulkan/wsi: use unsigned instead of uint
+Upstream: https://gitlab.freedesktop.org/mesa/demos/-/commit/3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326
+
+uint is not a standard type name and fails to build against musl libc
+
+Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
+---
+ src/vulkan/wsi/wayland.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/vulkan/wsi/wayland.c b/src/vulkan/wsi/wayland.c
+index 444d2bb81..5958d283a 100644
+--- a/src/vulkan/wsi/wayland.c
++++ b/src/vulkan/wsi/wayland.c
+@@ -128,7 +128,7 @@ dispatch_key(xkb_keycode_t xkb_key, enum wl_keyboard_key_state state)
+ }
+ 
+ static void
+-handle_key(uint key, enum wl_keyboard_key_state state)
++handle_key(unsigned key, enum wl_keyboard_key_state state)
+ {
+    xkb_keycode_t xkb_key = key + 8;
+    struct itimerspec timer = {0};
+@@ -151,15 +151,15 @@ handle_key(uint key, enum wl_keyboard_key_state state)
+ }
+ 
+ static void
+-key(void *data, struct wl_keyboard *keyboard, uint serial,
+-    uint time, uint key, enum wl_keyboard_key_state state)
++key(void *data, struct wl_keyboard *keyboard, unsigned serial,
++    unsigned time, unsigned key, enum wl_keyboard_key_state state)
+ {
+    handle_key(key, state);
+ }
+ 
+ static void
+-modifiers(void *data, struct wl_keyboard *keyboard, uint serial,
+-    uint mods_depressed, uint mods_latched, uint mods_locked, uint group)
++modifiers(void *data, struct wl_keyboard *keyboard, unsigned serial,
++    unsigned mods_depressed, unsigned mods_latched, unsigned mods_locked, unsigned group)
+ {
+    xkb_state_update_mask(keyboard_data.xkb_state, mods_depressed, mods_latched,
+                          mods_locked, 0, 0, group);
+@@ -184,7 +184,7 @@ keymap(void *data, struct wl_keyboard *keyboard,
+ }
+ 
+ static void
+-enter(void *data, struct wl_keyboard *keyboard, uint serial,
++enter(void *data, struct wl_keyboard *keyboard, unsigned serial,
+       struct wl_surface *surface, struct wl_array *keys)
+ {
+    uint32_t *key;
+@@ -194,7 +194,7 @@ enter(void *data, struct wl_keyboard *keyboard, uint serial,
+ }
+ 
+ static void
+-leave(void *data, struct wl_keyboard *keyboard, uint serial,
++leave(void *data, struct wl_keyboard *keyboard, unsigned serial,
+       struct wl_surface *surface)
+ {
+    struct itimerspec timer = {0};
+-- 
+GitLab
+
diff --git a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
index 6e399e32cb89..fa1556695a6e 100644
--- a/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild
@@ -52,6 +52,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PV}-Disable-things-we-don-t-want.patch
+	"${FILESDIR}"/${PV}-uint.patch
 )
 
 pkg_setup() {