From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] waffle: fix build against wayland 1.20
Date: Mon, 28 Feb 2022 13:09:07 +0100 [thread overview]
Message-ID: <20220228120907.2599041-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20220221130702.2686554-2-p.zabel@pengutronix.de>
Thanks, applied as c8c3b8ae22f7f87eaee41195df4da8e385053246.
Michael
[sent from post-receive hook]
On Mon, 28 Feb 2022 13:09:06 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20220221130702.2686554-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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 <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
> +Link: https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/106
> +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> +---
> + 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2022-02-28 12:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 13:07 [ptxdist] [PATCH 1/2] sdl2: " Philipp Zabel
2022-02-21 13:07 ` [ptxdist] [PATCH 2/2] waffle: " Philipp Zabel
2022-02-28 12:09 ` Michael Olbrich [this message]
2022-02-22 8:28 ` [ptxdist] [PATCH 1/2] sdl2: " Michael Olbrich
2022-02-22 12:06 ` Philipp Zabel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220228120907.2599041-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox