* [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20
@ 2022-02-21 13:07 Philipp Zabel
2022-02-21 13:07 ` [ptxdist] [PATCH 2/2] waffle: " Philipp Zabel
2022-02-22 8:28 ` [ptxdist] [PATCH 1/2] sdl2: " Michael Olbrich
0 siblings, 2 replies; 5+ messages in thread
From: Philipp Zabel @ 2022-02-21 13:07 UTC (permalink / raw)
To: ptxdist
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 ++
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] waffle: fix build against wayland 1.20
2022-02-21 13:07 [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20 Philipp Zabel
@ 2022-02-21 13:07 ` Philipp Zabel
2022-02-28 12:09 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-02-22 8:28 ` [ptxdist] [PATCH 1/2] sdl2: " Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Philipp Zabel @ 2022-02-21 13:07 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
...yland-fix-build-against-version-1.20.patch | 45 +++++++++++++++++++
patches/waffle-1.7.0/series | 4 ++
2 files changed, 49 insertions(+)
create mode 100644 patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
create mode 100644 patches/waffle-1.7.0/series
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
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20
2022-02-21 13:07 [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20 Philipp Zabel
2022-02-21 13:07 ` [ptxdist] [PATCH 2/2] waffle: " Philipp Zabel
@ 2022-02-22 8:28 ` Michael Olbrich
2022-02-22 12:06 ` Philipp Zabel
1 sibling, 1 reply; 5+ messages in thread
From: Michael Olbrich @ 2022-02-22 8:28 UTC (permalink / raw)
To: Philipp Zabel; +Cc: ptxdist
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20
2022-02-22 8:28 ` [ptxdist] [PATCH 1/2] sdl2: " Michael Olbrich
@ 2022-02-22 12:06 ` Philipp Zabel
0 siblings, 0 replies; 5+ messages in thread
From: Philipp Zabel @ 2022-02-22 12:06 UTC (permalink / raw)
To: Michael Olbrich; +Cc: ptxdist
On Di, 2022-02-22 at 09:28 +0100, Michael Olbrich wrote:
> 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.
Oh, I forgot to update SDL2 from PTXdist master in my test build.
Please ignore.
regards
Philipp
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] waffle: fix build against wayland 1.20
2022-02-21 13:07 ` [ptxdist] [PATCH 2/2] waffle: " Philipp Zabel
@ 2022-02-28 12:09 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2022-02-28 12:09 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-02-28 12:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-21 13:07 [ptxdist] [PATCH 1/2] sdl2: fix build against wayland 1.20 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 ` [ptxdist] [PATCH 1/2] sdl2: " Michael Olbrich
2022-02-22 12:06 ` Philipp Zabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox