0003-vulkan-wsi-use-unsigned-instead-of-uint.patch 2.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768
  1. From 3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326 Mon Sep 17 00:00:00 2001
  2. From: psykose <alice@ayaya.dev>
  3. Date: Thu, 23 Mar 2023 21:18:56 +0000
  4. Subject: [PATCH] vulkan/wsi: use unsigned instead of uint
  5. uint is not a standard type name and fails to build against musl libc
  6. Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
  7. Upstream: https://gitlab.freedesktop.org/mesa/demos/-/commit/3f4d5ff34e061f3d47b9cf28bff2fc588d8c5326
  8. Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
  9. ---
  10. src/vulkan/wsi/wayland.c | 14 +++++++-------
  11. 1 file changed, 7 insertions(+), 7 deletions(-)
  12. diff --git a/src/vulkan/wsi/wayland.c b/src/vulkan/wsi/wayland.c
  13. index 444d2bb81..5958d283a 100644
  14. --- a/src/vulkan/wsi/wayland.c
  15. +++ b/src/vulkan/wsi/wayland.c
  16. @@ -128,7 +128,7 @@ dispatch_key(xkb_keycode_t xkb_key, enum wl_keyboard_key_state state)
  17. }
  18. static void
  19. -handle_key(uint key, enum wl_keyboard_key_state state)
  20. +handle_key(unsigned key, enum wl_keyboard_key_state state)
  21. {
  22. xkb_keycode_t xkb_key = key + 8;
  23. struct itimerspec timer = {0};
  24. @@ -151,15 +151,15 @@ handle_key(uint key, enum wl_keyboard_key_state state)
  25. }
  26. static void
  27. -key(void *data, struct wl_keyboard *keyboard, uint serial,
  28. - uint time, uint key, enum wl_keyboard_key_state state)
  29. +key(void *data, struct wl_keyboard *keyboard, unsigned serial,
  30. + unsigned time, unsigned key, enum wl_keyboard_key_state state)
  31. {
  32. handle_key(key, state);
  33. }
  34. static void
  35. -modifiers(void *data, struct wl_keyboard *keyboard, uint serial,
  36. - uint mods_depressed, uint mods_latched, uint mods_locked, uint group)
  37. +modifiers(void *data, struct wl_keyboard *keyboard, unsigned serial,
  38. + unsigned mods_depressed, unsigned mods_latched, unsigned mods_locked, unsigned group)
  39. {
  40. xkb_state_update_mask(keyboard_data.xkb_state, mods_depressed, mods_latched,
  41. mods_locked, 0, 0, group);
  42. @@ -184,7 +184,7 @@ keymap(void *data, struct wl_keyboard *keyboard,
  43. }
  44. static void
  45. -enter(void *data, struct wl_keyboard *keyboard, uint serial,
  46. +enter(void *data, struct wl_keyboard *keyboard, unsigned serial,
  47. struct wl_surface *surface, struct wl_array *keys)
  48. {
  49. uint32_t *key;
  50. @@ -194,7 +194,7 @@ enter(void *data, struct wl_keyboard *keyboard, uint serial,
  51. }
  52. static void
  53. -leave(void *data, struct wl_keyboard *keyboard, uint serial,
  54. +leave(void *data, struct wl_keyboard *keyboard, unsigned serial,
  55. struct wl_surface *surface)
  56. {
  57. struct itimerspec timer = {0};
  58. --
  59. GitLab