fbf7d55421
This bump will fix the following build failure raised since bump of wayland to version 1.20.0 in commitf94ba5c31cthanks to71d46212a9and2c33597245: /home/giuliobenetti/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: ../../lib/libwaffle-1.so.0.6.1: undefined reference to `wl_proxy_get_version' /home/giuliobenetti/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/9.3.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: ../../lib/libwaffle-1.so.0.6.1: undefined reference to `wl_proxy_marshal_flags' https://gitlab.freedesktop.org/mesa/waffle/-/tags/v1.7.0 https://gitlab.freedesktop.org/mesa/waffle/-/tags/v1.6.3 https://gitlab.freedesktop.org/mesa/waffle/-/tags/v1.6.2 Fixes: - http://autobuild.buildroot.org/results/1fb1540b0ae6037140f386f44d6e17735f0674c4 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From 2c33597245bb74f19104f0a858cd40e80b26991d Mon Sep 17 00:00:00 2001
|
|
From: Philipp Zabel <p.zabel@pengutronix.de>
|
|
Date: Fri, 17 Dec 2021 13:46:40 +0100
|
|
Subject: [PATCH] wayland: fix build against version 1.20
|
|
|
|
Wayland 1.20 introduces two new symbols wl_proxy_marshal_flags and
|
|
wl_proxy_marshal_array_flags, which need to be wrapped as well.
|
|
|
|
Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/76
|
|
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
|
|
[Retrieved from:
|
|
https://gitlab.freedesktop.org/mesa/waffle/-/commit/2c33597245bb74f19104f0a858cd40e80b26991d]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
src/waffle/wayland/wayland_sym.h | 18 ++++++++++++++++++
|
|
src/waffle/wayland/wayland_wrapper.h | 2 ++
|
|
2 files changed, 20 insertions(+)
|
|
|
|
diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h
|
|
index 3d48625..4c6ac8d 100644
|
|
--- a/src/waffle/wayland/wayland_sym.h
|
|
+++ b/src/waffle/wayland/wayland_sym.h
|
|
@@ -26,3 +26,21 @@ WAFFLE_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor,
|
|
WAFFLE_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, ...))
|
|
+
|
|
+WAFFLE_WAYLAND_SYM(struct wl_proxy *,
|
|
+ wl_proxy_marshal_flags,
|
|
+ (struct wl_proxy * p,
|
|
+ uint32_t opcode,
|
|
+ const struct wl_interface *interface,
|
|
+ uint32_t version,
|
|
+ uint32_t flags,
|
|
+ ...))
|
|
+
|
|
+WAFFLE_WAYLAND_SYM(struct wl_proxy *,
|
|
+ wl_proxy_marshal_array_flags,
|
|
+ (struct wl_proxy * p,
|
|
+ uint32_t opcode,
|
|
+ const struct wl_interface *interface,
|
|
+ uint32_t version,
|
|
+ uint32_t flags,
|
|
+ union wl_argument *args))
|
|
diff --git a/src/waffle/wayland/wayland_wrapper.h b/src/waffle/wayland/wayland_wrapper.h
|
|
index 4af2f64..6addf4f 100644
|
|
--- a/src/waffle/wayland/wayland_wrapper.h
|
|
+++ b/src/waffle/wayland/wayland_wrapper.h
|
|
@@ -65,5 +65,7 @@ struct wl_display;
|
|
#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)
|
|
+#define wl_proxy_marshal_flags (*wfl_wl_proxy_marshal_flags)
|
|
+#define wl_proxy_marshal_array_flags (*wfl_wl_proxy_marshal_array_flags)
|
|
|
|
#include <wayland-client-protocol.h>
|
|
--
|
|
GitLab
|
|
|