[PATCH] wayland: Add wl_proxy_marshal_constructor_versioned sym

SDL Development
1

Hey,

Sending this tiny patch partly to see if this is the way to send
patches. Please let me know if there are other ways preferred.

The patch attached makes it possible to build libSDL with
wayland-client-1.10, which introduced a new symbol.

Jonas
-------------- next part --------------

HG changeset patch

User Jonas ?dahl <@Jonas_Adahl>

Date 1455693260 -28800

Wed Feb 17 15:14:20 2016 +0800

Branch pointer-lock-v3

Node ID 6ab58dc0c9f8dfc8c150c2861c3fa95a885b21fd

Parent 12fd4b5b33712bed3d63935395c1f5d3b217fbc8

wayland: Add wl_proxy_marshal_constructor_versioned sym

wl_proxy_marshal_constructor_versioned was introduce in wayland-client 1.10.

diff -r 12fd4b5b3371 -r 6ab58dc0c9f8 src/video/wayland/SDL_waylanddyn.h
— a/src/video/wayland/SDL_waylanddyn.h Tue Feb 16 13:51:24 2016 -0800
+++ b/src/video/wayland/SDL_waylanddyn.h Wed Feb 17 15:14:20 2016 +0800
@@ -79,6 +79,7 @@
#define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
#define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener)
#define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor)
+#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)

#define wl_seat_interface (*WAYLAND_wl_seat_interface)
#define wl_surface_interface (*WAYLAND_wl_surface_interface)
diff -r 12fd4b5b3371 -r 6ab58dc0c9f8 src/video/wayland/SDL_waylandsym.h
— a/src/video/wayland/SDL_waylandsym.h Tue Feb 16 13:51:24 2016 -0800
+++ b/src/video/wayland/SDL_waylandsym.h Wed Feb 17 15:14:20 2016 +0800
@@ -55,6 +55,9 @@
SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4)
SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, …))

+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_INTERFACE(wl_seat_interface)
SDL_WAYLAND_INTERFACE(wl_surface_interface)
SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)

2

The patch attached makes it possible to build libSDL with
wayland-client-1.10, which introduced a new symbol.

This symbol isn’t actually used in this patch, though…this is
necessary to make SDL build?

–ryan.

3

I can add that the symbol apparently is required by ‘wl_registry_bind’. I
get this link error:
libSDL2.a(SDL_waylandvideo.c.o): In function wl_registry_bind': /usr/include/wayland-client-protocol.h:305: undefined reference towl_proxy_marshal_constructor_versioned’

  • MagnusOn Fri, Feb 19, 2016 at 5:18 AM Ryan C. Gordon wrote:

The patch attached makes it possible to build libSDL with
wayland-client-1.10, which introduced a new symbol.

This symbol isn’t actually used in this patch, though…this is
necessary to make SDL build?

–ryan.

4

The patch attached makes it possible to build libSDL with
wayland-client-1.10, which introduced a new symbol.

This symbol isn’t actually used in this patch, though…this is necessary to
make SDL build?

–ryan.

As Magnus mentioned, yes it is, just not in the libSDL source code, but
in a file (wayland-client-protocol.h) that is included from the libSDL
source code.

After being told to, I also upladed the same patch here:
https://bugzilla.libsdl.org/show_bug.cgi?id=3265

JonasOn Thu, Feb 18, 2016 at 11:18:47PM -0500, Ryan C. Gordon wrote:

SDL mailing list
SDL at lists.libsdl.org
http://lists.libsdl.org/listinfo.cgi/sdl-libsdl.org

5

As Magnus mentioned, yes it is, just not in the libSDL source code, but
in a file (wayland-client-protocol.h) that is included from the libSDL
source code.

Ah, I get it. I’ve applied the patch to revision control now:

 https://hg.libsdl.org/SDL/rev/330f500d5815

Thanks!

–ryan.