From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 22 Feb 2022 09:28:27 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nMQX5-006gOe-S4 for lore@lore.pengutronix.de; Tue, 22 Feb 2022 09:28:27 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nMQX5-0001Np-1k; Tue, 22 Feb 2022 09:28:27 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nMQWk-0001NE-IF; Tue, 22 Feb 2022 09:28:06 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nMQWk-000aL7-IV; Tue, 22 Feb 2022 09:28:05 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nMQWj-00FU3o-0j; Tue, 22 Feb 2022 09:28:05 +0100 Date: Tue, 22 Feb 2022 09:28:05 +0100 From: Michael Olbrich To: Philipp Zabel Message-ID: Mail-Followup-To: Philipp Zabel , ptxdist@pengutronix.de References: <20220221130702.2686554-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220221130702.2686554-1-p.zabel@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false On Mon, Feb 21, 2022 at 02:07:01PM +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > --- > .../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 > +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