This fixes waffle to build against wayland 1.10.
Thanks to Jason Eckstrand for help getting this working.
Fixes #38
cc: Chad Versace <chad.vers...@linux.intel.com>
cc: Mark Janes <mark.a.ja...@intel.com>
Signed-off-by: Dylan Baker <dylanx.c.ba...@intel.com>
---
src/waffle/wayland/wayland_wrapper.c | 1 +
src/waffle/wayland/wayland_wrapper.h | 8 ++++++++
2 files changed, 9 insertions(+)
diff --git a/src/waffle/wayland/wayland_wrapper.c
b/src/waffle/wayland/wayland_wrapper.c
index 6ffd5a9..06fa336 100644
--- a/src/waffle/wayland/wayland_wrapper.c
+++ b/src/waffle/wayland/wayland_wrapper.c
@@ -106,6 +106,7 @@ wayland_wrapper_init(void)
RETRIEVE_WL_CLIENT_SYMBOL(wl_proxy_add_listener);
RETRIEVE_WL_CLIENT_SYMBOL(wl_proxy_marshal);
RETRIEVE_WL_CLIENT_SYMBOL(wl_proxy_marshal_constructor);
+ RETRIEVE_WL_CLIENT_SYMBOL(wl_proxy_marshal_constructor_versioned);
#undef RETRIEVE_WL_CLIENT_SYMBOL
error:
diff --git a/src/waffle/wayland/wayland_wrapper.h
b/src/waffle/wayland/wayland_wrapper.h
index 40a581a..e45ff64 100644
--- a/src/waffle/wayland/wayland_wrapper.h
+++ b/src/waffle/wayland/wayland_wrapper.h
@@ -75,6 +75,13 @@ struct wl_proxy *
const struct wl_interface *interface,
...);
+struct wl_proxy *
+(*wfl_wl_proxy_marshal_constructor_versioned)(struct wl_proxy *proxy,
+ uint32_t opcode,
+ const struct wl_interface
*interface,
+ uint32_t version,
+ ...);
+
#ifdef _WAYLAND_CLIENT_H
#error Do not include wayland-client.h ahead of wayland_wrapper.h
#endif
@@ -92,3 +99,4 @@ struct wl_proxy *
#define wl_proxy_add_listener (*wfl_wl_proxy_add_listener)
#define wl_proxy_marshal (*wfl_wl_proxy_marshal)
#define wl_proxy_marshal_constructor (*wfl_wl_proxy_marshal_constructor)
+#define wl_proxy_marshal_constructor_versioned
(*wfl_wl_proxy_marshal_constructor_versioned)
--
2.8.0
_______________________________________________
waffle mailing list
waffle@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/waffle
