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

8 files changed, 74 insertions, 5 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index b6fd23f094c0..472874df2803 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
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() {
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index 210ebf66df0f..ee3ec16e835c 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,5 +1,5 @@
 DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
 DIST xbacklight-1.2.4.tar.xz 121276 BLAKE2B d0a05f0e5c09c9a1114b044123c8cb9ca97d07c87d7941df1db29ad400e38d39ad3e78e528bc4b3f7ee69b24c74e436b618ea5abbae4517dbbbce0577ea30f9a SHA512 6aa39d8f4430b2b9da92afff462aebbd0f3fdef50bf6a4fc3e5c08e45ae18156dc2017b8a46cd3185b2e4b1b836d2bd7379821a6591afa3d6db395247c8193e3
 EBUILD xbacklight-1.2.3.ebuild 357 BLAKE2B 99d693809f3e0968266481e7113a4849a7b3bcbfa38bc5a99ec9a636b32167226ef3ecc4ed15e6adf90280cdce3a147a24c19766286d88224482b7d266d003d8 SHA512 f22f74140b4fed445b6dabda4b7ca7e5a208bdb0d5047b1a99cc58fab9d27eb70589b0c2b4d78e8e39c05e860d641b5d1d4d05a60136c381cdf331f28b643a9d
-EBUILD xbacklight-1.2.4.ebuild 388 BLAKE2B 356d89ad782534293a679029e56873fd587f20c6b6d5033826cd5e7c2b59cb0f4acc4d1595ab4483b6d4dd62cc03d75a07bf623eabee4f03bcc7ad9efbcbf56c SHA512 9330cd14edbea1cd59c922baa9436393b497d80a97a3009fa15ac36808d1bdd0a011b7368b00fadd06447fff7d82be1256b2dfb65c94456c1c9bb041f1531b88
+EBUILD xbacklight-1.2.4.ebuild 383 BLAKE2B 3a90aef484483619c0c90761bd7d385f7afb17befa4c952b9a39bc227e5dde59896dcffb400a57178dc760937c66ea9f833e506c22a0a034fcab954ffbcc6210 SHA512 81e631f44f0167b1ce63b3cdb3a63c81f8d82e47a26a474a2f0aabe1b9711dc6d0588172e2400359b75977231e89a4c6d26f31636b09792130402ea6f712cfbe
 MISC metadata.xml 341 BLAKE2B 5fdf087fc2f573e735981e4af574304f6d0ec1815a0b7d961e8eab7697e37fdc8cb746b84b4a3f8d356f06704b62eb81e9b6dd83333a481efa0c7c590013906e SHA512 edc896038f569f3d2f9ed2a6a42e292de08f62e548c4a02128e1a4ea6b8b487af8849edda3dbd04b367c3ea880a5f72722c3622e33ea7fb3ade26d294e9074b6
diff --git a/x11-apps/xbacklight/xbacklight-1.2.4.ebuild b/x11-apps/xbacklight/xbacklight-1.2.4.ebuild
index 63940b430aec..72c667859c49 100644
--- a/x11-apps/xbacklight/xbacklight-1.2.4.ebuild
+++ b/x11-apps/xbacklight/xbacklight-1.2.4.ebuild
@@ -6,7 +6,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="x11-libs/libxcb
 	>=x11-libs/xcb-util-0.3.8"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index a6497b6644dc..7abdb9575989 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,5 +1,5 @@
 DIST xrandr-1.5.2.tar.xz 174012 BLAKE2B 7c4afea6b8bc4361bde2565e930db98abb925b51d717e23c3ec95853aacf58b465f8c858652b8eebd7b0fdb289b4da4ab9235e571f61c8f77e4818efcb12de07 SHA512 b536e8f1e04094894aa52ae496725c58691b043860b3327c41d737b07b642a939733321b62f698032b11ba857208a6177600a3ca3295ff1be6ade4341cdc2747
 DIST xrandr-1.5.3.tar.xz 176852 BLAKE2B a2f253e0027976ef1bbf346361f6cfcfb575db36f134ec21e234f733fe7e70959d401c6b078a0d6d0297021aeff12eef57e4fdc865c86531784e439927385995 SHA512 2096afb9040ca18005aaf744401df40bdb8e8c8c06ffc97b927e63131800a4dc40cec063bdb5f38cd74b3d24b25fbed258c16cb6c73161efea44b3065b15c100
 EBUILD xrandr-1.5.2.ebuild 527 BLAKE2B 363eeda01a2467e14cd53d396c80c153b932dcca2e50af23927bb19d05d60b0964d068e409bf7f6a208acc6d9555ec94568b9fe1e483c0ca6bcb5a86a7e90bc4 SHA512 0289d8a979f91eadd9e67d9d5b7d58964ed637f6a98c40449e0b23c35cf9ebe0c4ec8d9dd77b686e4499ce127d71841fc21c870834a278b2af4a9ac440a52bec
-EBUILD xrandr-1.5.3.ebuild 533 BLAKE2B 7dc3d306f92d931ea222f500fd5b42969a65fe143a5a016f40f597fc288fa1d17d3716b97c4ef44aa162e38d15adb9e0cea47e7f8a7227b46df1579a50e56ed5 SHA512 1646ede4b36588a7f8c3253e2157afd19929eb0f8c158a87571cc09258eb9e7c6e53ec968c125c986411b8247f9b9ddb4f07e4163c6a2dd809741ab925ed7589
+EBUILD xrandr-1.5.3.ebuild 528 BLAKE2B 85bc4a6d1b424de968db21281664c9a2a3363ef9f7204897005e87a2caa70fdb926fe931707605dc63de8ad5e78275453f27d882dc8d11ca2292f7b827d83279 SHA512 ab0f43606f1995b68a32f1722846c01f9f0380ceeea2fbcf6503e64f91f0b81dc6b9171c706e75b533f039470f75d33353e1ee42091c57b140c4d45787f28f92
 MISC metadata.xml 337 BLAKE2B 3003fb3f334179c653f32ef2a864a609df08a585981e15adb49cb63209530479c22c0ed5c5e62e64d3647b25b57e28af7a41d948af012ed450ad1afd6be23374 SHA512 e51bf78854aaa4634a164f04408ccc202983e118f987cb90469feefefe51ee4671ba9b3a329b71ab6806022c0e6beb32ff27c7ee35682945a3bb8fd1a40636c2
diff --git a/x11-apps/xrandr/xrandr-1.5.3.ebuild b/x11-apps/xrandr/xrandr-1.5.3.ebuild
index bc2a9a8f2d5f..f6d5fb365119 100644
--- a/x11-apps/xrandr/xrandr-1.5.3.ebuild
+++ b/x11-apps/xrandr/xrandr-1.5.3.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="A primitive command line interface to RandR extension"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=x11-libs/libXrandr-1.5
 	x11-libs/libXrender