From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH 1/2] waffle: version bump 1.7.0 -> 1.7.2
Date: Tue, 14 Mar 2023 15:00:09 +0100 [thread overview]
Message-ID: <20230314140010.2452314-1-p.zabel@pengutronix.de> (raw)
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
next reply other threads:[~2023-03-14 14:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 14:00 Philipp Zabel [this message]
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
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=20230314140010.2452314-1-p.zabel@pengutronix.de \
--to=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