From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 28 Feb 2022 13:09:50 +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 1nOeqc-00DCpG-GV for lore@lore.pengutronix.de; Mon, 28 Feb 2022 13:09:50 +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 1nOeqb-0001qe-Ot; Mon, 28 Feb 2022 13:09:49 +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 1nOepx-0001q6-FG; Mon, 28 Feb 2022 13:09:09 +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 1nOepw-001oQS-Oo; Mon, 28 Feb 2022 13:09:08 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nOepv-00AuVL-0f; Mon, 28 Feb 2022 13:09:07 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 28 Feb 2022 13:09:07 +0100 Message-Id: <20220228120907.2599041-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220221130702.2686554-2-p.zabel@pengutronix.de> References: <20220221130702.2686554-2-p.zabel@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] waffle: 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: Philipp Zabel 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 Thanks, applied as c8c3b8ae22f7f87eaee41195df4da8e385053246. Michael [sent from post-receive hook] On Mon, 28 Feb 2022 13:09:06 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20220221130702.2686554-2-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 > 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 > +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 > 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