From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 24 Mar 2023 10:03:58 +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 1pfdL3-00D3jG-DK for lore@lore.pengutronix.de; Fri, 24 Mar 2023 10:03:58 +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 1pfdL3-00089x-Mh; Fri, 24 Mar 2023 10:03:57 +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 1pfdKf-00089D-Gn; Fri, 24 Mar 2023 10:03:33 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pfdKe-006LC1-SW; Fri, 24 Mar 2023 10:03:32 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pfdKe-001FEb-6U; Fri, 24 Mar 2023 10:03:32 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 24 Mar 2023 10:03:32 +0100 Message-Id: <20230324090332.296684-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230314140010.2452314-1-p.zabel@pengutronix.de> References: <20230314140010.2452314-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] waffle: version bump 1.7.0 -> 1.7.2 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: Philipp Zabel 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 Thanks, applied as e76326578c86c3b257826c99a4882cce60a2a7d0. Michael [sent from post-receive hook] On Fri, 24 Mar 2023 10:03:31 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20230314140010.2452314-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 > -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 > ---- > - 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 > 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)