* [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2
@ 2023-03-14 14:00 Philipp Zabel
2023-03-14 14:00 ` [ptxdist] [PATCH 2/2] waffle: switch to meson build system Philipp Zabel
2023-03-24 9:03 ` [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2 Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Philipp Zabel @ 2023-03-14 14:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
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 --
rules/waffle.make | 4 +-
3 files changed, 2 insertions(+), 51 deletions(-)
delete mode 100644 patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
delete 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
deleted file mode 100644
index 8f021e23634b..000000000000
--- a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 1106ee64a93a..000000000000
--- a/patches/waffle-1.7.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-wayland-fix-build-against-version-1.20.patch
-# 2ea95c3f6d7514be3a2fefe02b81c232 - git-ptx-patches magic
diff --git a/rules/waffle.make b/rules/waffle.make
index 108f5a7d3221..cfea0e37ebde 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
#
# Paths and names
#
-WAFFLE_VERSION := 1.7.0
-WAFFLE_MD5 := 1e77b0cd95856fc9594f556fe9e13cb9
+WAFFLE_VERSION := 1.7.2
+WAFFLE_MD5 := e5e9772fe2c1e6267794f7aba08637c8
WAFFLE := waffle-$(WAFFLE_VERSION)
WAFFLE_SUFFIX := tar.xz
WAFFLE_URL := https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [ptxdist] [PATCH 2/2] waffle: switch to meson build system
2023-03-14 14:00 [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2 Philipp Zabel
@ 2023-03-14 14:00 ` Philipp Zabel
2023-03-24 9:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-03-24 9:03 ` [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2 Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Philipp Zabel @ 2023-03-14 14:00 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
rules/waffle.in | 3 +--
rules/waffle.make | 27 ++++++++++++---------------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/rules/waffle.in b/rules/waffle.in
index 1a5339407f8c..a125621f9c7c 100644
--- a/rules/waffle.in
+++ b/rules/waffle.in
@@ -3,8 +3,7 @@
menuconfig WAFFLE
tristate
prompt "waffle "
- select HOST_CMAKE
- select HOST_NINJA
+ select HOST_MESON
select MESALIB
select LIBXCB if WAFFLE_GLX || WAFFLE_X11_EGL
select XORG_LIB_X11 if WAFFLE_GLX || WAFFLE_X11_EGL
diff --git a/rules/waffle.make b/rules/waffle.make
index cfea0e37ebde..4c53b9116351 100644
--- a/rules/waffle.make
+++ b/rules/waffle.make
@@ -29,24 +29,21 @@ WAFFLE_LICENSE_FILES := \
# Prepare
# ----------------------------------------------------------------------------
-WAFFLE_CONF_TOOL := cmake
+WAFFLE_CONF_TOOL := meson
WAFFLE_CONF_OPT := \
- $(CROSS_CMAKE_USR) \
- -G Ninja \
- -DVALGRIND_EXECUTABLE= \
+ $(CROSS_MESON_USR) \
+ -Dbuild-examples=false \
+ -Dbuild-htmldocs=false \
+ -Dbuild-manpages=false \
+ -Dbuild-tests=false \
+ -Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
+ -Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
+ -Dnacl=false \
-Dnacl_sdk_path= \
-Dnacl_version= \
- -Dwaffle_build_examples=OFF \
- -Dwaffle_build_htmldocs=OFF \
- -Dwaffle_build_manpages=OFF \
- -Dwaffle_build_tests=OFF \
- -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
- -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
- -Dwaffle_has_nacl=OFF \
- -Dwaffle_has_surfaceless_egl=OFF \
- -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
- -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
- -Dwaffle_xsltproc=
+ -Dsurfaceless_egl=disabled \
+ -Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
+ -Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d
# ----------------------------------------------------------------------------
# Target-Install
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] waffle: switch to meson build system
2023-03-14 14:00 ` [ptxdist] [PATCH 2/2] waffle: switch to meson build system Philipp Zabel
@ 2023-03-24 9:03 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2023-03-24 9:03 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as c9a53bbdff81304ec3b6b7a69f744d50c1aea8f1.
Michael
[sent from post-receive hook]
On Fri, 24 Mar 2023 10:03:33 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230314140010.2452314-2-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/waffle.in b/rules/waffle.in
> index 1a5339407f8c..a125621f9c7c 100644
> --- a/rules/waffle.in
> +++ b/rules/waffle.in
> @@ -3,8 +3,7 @@
> menuconfig WAFFLE
> tristate
> prompt "waffle "
> - select HOST_CMAKE
> - select HOST_NINJA
> + select HOST_MESON
> select MESALIB
> select LIBXCB if WAFFLE_GLX || WAFFLE_X11_EGL
> select XORG_LIB_X11 if WAFFLE_GLX || WAFFLE_X11_EGL
> diff --git a/rules/waffle.make b/rules/waffle.make
> index cfea0e37ebde..4c53b9116351 100644
> --- a/rules/waffle.make
> +++ b/rules/waffle.make
> @@ -29,24 +29,21 @@ WAFFLE_LICENSE_FILES := \
> # Prepare
> # ----------------------------------------------------------------------------
>
> -WAFFLE_CONF_TOOL := cmake
> +WAFFLE_CONF_TOOL := meson
> WAFFLE_CONF_OPT := \
> - $(CROSS_CMAKE_USR) \
> - -G Ninja \
> - -DVALGRIND_EXECUTABLE= \
> + $(CROSS_MESON_USR) \
> + -Dbuild-examples=false \
> + -Dbuild-htmldocs=false \
> + -Dbuild-manpages=false \
> + -Dbuild-tests=false \
> + -Dgbm=$(call ptx/endis,PTXCONF_WAFFLE_GBM)d \
> + -Dglx=$(call ptx/endis,PTXCONF_WAFFLE_GLX)d \
> + -Dnacl=false \
> -Dnacl_sdk_path= \
> -Dnacl_version= \
> - -Dwaffle_build_examples=OFF \
> - -Dwaffle_build_htmldocs=OFF \
> - -Dwaffle_build_manpages=OFF \
> - -Dwaffle_build_tests=OFF \
> - -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
> - -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
> - -Dwaffle_has_nacl=OFF \
> - -Dwaffle_has_surfaceless_egl=OFF \
> - -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
> - -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
> - -Dwaffle_xsltproc=
> + -Dsurfaceless_egl=disabled \
> + -Dwayland=$(call ptx/endis,PTXCONF_WAFFLE_WAYLAND)d \
> + -Dx11_egl=$(call ptx/endis,PTXCONF_WAFFLE_X11_EGL)d
>
> # ----------------------------------------------------------------------------
> # Target-Install
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2
2023-03-14 14:00 [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2 Philipp Zabel
2023-03-14 14:00 ` [ptxdist] [PATCH 2/2] waffle: switch to meson build system Philipp Zabel
@ 2023-03-24 9:03 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2023-03-24 9:03 UTC (permalink / raw)
To: ptxdist; +Cc: Philipp Zabel
Thanks, applied as e76326578c86c3b257826c99a4882cce60a2a7d0.
Michael
[sent from post-receive hook]
On Fri, 24 Mar 2023 10:03:31 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230314140010.2452314-1-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
> deleted file mode 100644
> index 8f021e23634b..000000000000
> --- a/patches/waffle-1.7.0/0001-wayland-fix-build-against-version-1.20.patch
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -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
> deleted file mode 100644
> index 1106ee64a93a..000000000000
> --- a/patches/waffle-1.7.0/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-wayland-fix-build-against-version-1.20.patch
> -# 2ea95c3f6d7514be3a2fefe02b81c232 - git-ptx-patches magic
> diff --git a/rules/waffle.make b/rules/waffle.make
> index 108f5a7d3221..cfea0e37ebde 100644
> --- a/rules/waffle.make
> +++ b/rules/waffle.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
> #
> # Paths and names
> #
> -WAFFLE_VERSION := 1.7.0
> -WAFFLE_MD5 := 1e77b0cd95856fc9594f556fe9e13cb9
> +WAFFLE_VERSION := 1.7.2
> +WAFFLE_MD5 := e5e9772fe2c1e6267794f7aba08637c8
> WAFFLE := waffle-$(WAFFLE_VERSION)
> WAFFLE_SUFFIX := tar.xz
> WAFFLE_URL := https://mesa.pages.freedesktop.org/waffle/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-24 9:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-14 14:00 [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2 Philipp Zabel
2023-03-14 14:00 ` [ptxdist] [PATCH 2/2] waffle: switch to meson build system Philipp Zabel
2023-03-24 9:03 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-03-24 9:03 ` [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox