On Mon, Feb 21, 2022 at 02:07:01PM +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel <[email protected]> > --- > .../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 <[email protected]> > +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 > [email protected] > To unsubscribe, send a mail with subject "unsubscribe" to > [email protected] > -- 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
