Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package waffle for openSUSE:Factory checked in at 2022-01-31 22:57:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/waffle (Old) and /work/SRC/openSUSE:Factory/.waffle.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waffle" Mon Jan 31 22:57:23 2022 rev:9 rq:950213 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/waffle/waffle.changes 2021-03-08 15:20:49.146095183 +0100 +++ /work/SRC/openSUSE:Factory/.waffle.new.1898/waffle.changes 2022-01-31 22:58:13.849214391 +0100 @@ -1,0 +2,5 @@ +Fri Jan 21 11:14:01 UTC 2022 - Bj??rn Lie <[email protected]> + +- Add 106.patch: wayland: fix build against version 1.20. + +------------------------------------------------------------------- New: ---- 106.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ waffle.spec ++++++ --- /var/tmp/diff_new_pack.lrMvY8/_old 2022-01-31 22:58:14.337211105 +0100 +++ /var/tmp/diff_new_pack.lrMvY8/_new 2022-01-31 22:58:14.341211079 +0100 @@ -1,7 +1,7 @@ # # spec file for package waffle # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Source0: https://gitlab.freedesktop.org/mesa/waffle/-/raw/website/files/release/%{name}-%{version}/%{name}-%{version}.tar.xz Source1: https://gitlab.freedesktop.org/mesa/waffle/-/raw/website/files/release/%{name}-%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch0: https://gitlab.freedesktop.org/mesa/waffle/-/merge_requests/106.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -75,7 +76,7 @@ develop Waffle applications. %prep -%setup -q +%autosetup -p1 %build %cmake \ ++++++ 106.patch ++++++ >From c1c2dd566496c26e025fad83b612b3f6eaa7e232 Mon Sep 17 00:00:00 2001 From: Philipp Zabel <[email protected]> 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 Signed-off-by: Philipp Zabel <[email protected]> --- src/waffle/wayland/wayland_sym.h | 18 ++++++++++++++++++ src/waffle/wayland/wayland_wrapper.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/waffle/wayland/wayland_sym.h b/src/waffle/wayland/wayland_sym.h index 3d48625..4c6ac8d 100644 --- a/src/waffle/wayland/wayland_sym.h +++ b/src/waffle/wayland/wayland_sym.h @@ -26,3 +26,21 @@ 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 4af2f64..6addf4f 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> -- GitLab
