Thanks, applied as c8c3b8ae22f7f87eaee41195df4da8e385053246. Michael
[sent from post-receive hook] On Mon, 28 Feb 2022 13:09:06 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch > b/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch > new file mode 100644 > index 000000000000..8f021e23634b > --- /dev/null > +++ b/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch > @@ -0,0 +1,45 @@ > +From: Philipp Zabel <[email protected]> > +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 > +Link: https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/106 > +Signed-off-by: Philipp Zabel <[email protected]> > +--- > + src/waffle/wayland/wayland_sym.h | 10 ++++++++++ > + src/waffle/wayland/wayland_wrapper.h | 2 ++ > + 2 files changed, 12 insertions(+) > + > +diff --git a/src/waffle/wayland/wayland_sym.h > b/src/waffle/wayland/wayland_sym.h > +index 3d486255508f..ada78ddf47a0 100644 > +--- a/src/waffle/wayland/wayland_sym.h > ++++ b/src/waffle/wayland/wayland_sym.h > +@@ -26,3 +26,13 @@ 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 4af2f64f2890..6addf4ff4c1f 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> > diff --git a/patches/waffle-1.7.0/series b/patches/waffle-1.7.0/series > new file mode 100644 > index 000000000000..1106ee64a93a > --- /dev/null > +++ b/patches/waffle-1.7.0/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-wayland-fix-build-against-version-1.20.patch > +# 2ea95c3f6d7514be3a2fefe02b81c232 - git-ptx-patches magic _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
