git: c5812b6f2c3d - main - devel/sdl20: replace 571ee96df4f6 with upstream fix

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c5812b6f2c3d9f1dde4d3a7077cc60adca38bd3a

commit c5812b6f2c3d9f1dde4d3a7077cc60adca38bd3a
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-12-26 16:04:45 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-12-26 17:09:28 +0000

    devel/sdl20: replace 571ee96df4f6 with upstream fix
---
 devel/sdl20/files/patch-wayland-1.20 | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/devel/sdl20/files/patch-wayland-1.20 b/devel/sdl20/files/patch-wayland-1.20
index bd219dccc701..724894a1b714 100644
--- a/devel/sdl20/files/patch-wayland-1.20
+++ b/devel/sdl20/files/patch-wayland-1.20
@@ -1,3 +1,5 @@
+https://github.com/libsdl-org/sdl/commit/e2ade2bfc46d
+
 ld: error: undefined symbol: wl_proxy_marshal_flags
 >>> referenced by SDL_waylanddatamanager.c
 >>>               build/.libs/SDL_waylanddatamanager.o:(Wayland_data_source_destroy)
@@ -9,21 +11,25 @@ ld: error: undefined symbol: wl_proxy_marshal_flags
 
 --- src/video/wayland/SDL_waylanddyn.h.orig	2020-03-11 01:36:18 UTC
 +++ src/video/wayland/SDL_waylanddyn.h
-@@ -75,6 +75,7 @@ void SDL_WAYLAND_UnloadSymbols(void);
+@@ -75,6 +75,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
  #define wl_proxy_create (*WAYLAND_wl_proxy_create)
  #define wl_proxy_destroy (*WAYLAND_wl_proxy_destroy)
  #define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal)
 +#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
++#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
  #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data)
  #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
  #define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version)
 --- src/video/wayland/SDL_waylandsym.h.orig	2020-03-11 01:36:18 UTC
 +++ src/video/wayland/SDL_waylandsym.h
-@@ -35,6 +35,7 @@
+@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_co
+ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
+ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...))
  
- SDL_WAYLAND_MODULE(WAYLAND_CLIENT)
- SDL_WAYLAND_SYM(void, wl_proxy_marshal, (struct wl_proxy *, uint32_t, ...))
-+SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_flags, (struct wl_proxy *, uint32_t, const struct wl_interface *, uint32_t, uint32_t, ...))
- SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_create, (struct wl_proxy *, const struct wl_interface *))
- SDL_WAYLAND_SYM(void, wl_proxy_destroy, (struct wl_proxy *))
- SDL_WAYLAND_SYM(int, wl_proxy_add_listener, (struct wl_proxy *, void (**)(void), void *))
++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version,  uint32_t flags, union wl_argument *args))
++
+ SDL_WAYLAND_INTERFACE(wl_seat_interface)
+ SDL_WAYLAND_INTERFACE(wl_surface_interface)
+ SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)