From: Michael Olbrich <m.olbrich@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20
Date: Tue, 22 Feb 2022 09:28:05 +0100 [thread overview]
Message-ID: <YhSelX1OYvZgthNy@pengutronix.de> (raw)
In-Reply-To: <20220221130702.2686554-1-p.zabel@pengutronix.de>
On Mon, Feb 21, 2022 at 02:07:01PM +0100, Philipp Zabel wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
> .../0001-Fix-build-against-wayland-1.20.patch | 40 +++++++++++++++++++
> patches/SDL2-2.0.16/series | 4 ++
The version in ptxdist is 2.0.20 an this patch is already applied there.
Michael
> 2 files changed, 44 insertions(+)
> create mode 100644 patches/SDL2-2.0.16/0001-Fix-build-against-wayland-1.20.patch
> create mode 100644 patches/SDL2-2.0.16/series
>
> diff --git a/patches/SDL2-2.0.16/0001-Fix-build-against-wayland-1.20.patch b/patches/SDL2-2.0.16/0001-Fix-build-against-wayland-1.20.patch
> new file mode 100644
> index 000000000000..2cc975bd24b5
> --- /dev/null
> +++ b/patches/SDL2-2.0.16/0001-Fix-build-against-wayland-1.20.patch
> @@ -0,0 +1,40 @@
> +From: David Redondo <kde@david-redondo.de>
> +Date: Fri, 10 Dec 2021 16:22:34 +0100
> +Subject: [PATCH] Fix build against wayland 1.20
> +
> +Fixes #5088
> +
> +Link: https://github.com/libsdl-org/SDL/pull/5092
> +---
> + src/video/wayland/SDL_waylanddyn.h | 2 ++
> + src/video/wayland/SDL_waylandsym.h | 4 ++++
> + 2 files changed, 6 insertions(+)
> +
> +diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
> +index 6cd5273160d9..d1ab033616b2 100644
> +--- a/src/video/wayland/SDL_waylanddyn.h
> ++++ b/src/video/wayland/SDL_waylanddyn.h
> +@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
> + #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
> + #define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag)
> + #define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag)
> ++#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
> ++#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
> +
> + #define wl_seat_interface (*WAYLAND_wl_seat_interface)
> + #define wl_surface_interface (*WAYLAND_wl_surface_interface)
> +diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
> +index 10602740b223..1211937d9eee 100644
> +--- a/src/video/wayland/SDL_waylandsym.h
> ++++ b/src/video/wayland/SDL_waylandsym.h
> +@@ -77,6 +77,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18)
> + SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *))
> + SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *))
> +
> ++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
> ++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
> ++SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args))
> ++
> + SDL_WAYLAND_INTERFACE(wl_seat_interface)
> + SDL_WAYLAND_INTERFACE(wl_surface_interface)
> + SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
> diff --git a/patches/SDL2-2.0.16/series b/patches/SDL2-2.0.16/series
> new file mode 100644
> index 000000000000..1a708f4cd36c
> --- /dev/null
> +++ b/patches/SDL2-2.0.16/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Fix-build-against-wayland-1.20.patch
> +# f892d02e7f9e16f987777382ffec978a - git-ptx-patches magic
> --
> 2.30.2
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
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-22 8:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 13:07 Philipp Zabel
2022-02-21 13:07 ` [ptxdist] [PATCH 2/2] waffle: " Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-22 8:28 ` Michael Olbrich [this message]
2022-02-22 12:06 ` [ptxdist] [PATCH 1/2] sdl2: " 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=YhSelX1OYvZgthNy@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