diff --git a/f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a.patch b/f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a.patch deleted file mode 100644 index 7bd0c34..0000000 --- a/f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= -Date: Tue, 28 Jan 2020 15:27:24 +0100 -Subject: [PATCH] Declare wlr_seat globals as extern - ---- - include/types/wlr_seat.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/types/wlr_seat.h b/include/types/wlr_seat.h -index 0ccb33455..2a3cd69bb 100644 ---- a/include/types/wlr_seat.h -+++ b/include/types/wlr_seat.h -@@ -4,9 +4,9 @@ - #include - #include - --const struct wlr_pointer_grab_interface default_pointer_grab_impl; --const struct wlr_keyboard_grab_interface default_keyboard_grab_impl; --const struct wlr_touch_grab_interface default_touch_grab_impl; -+extern const struct wlr_pointer_grab_interface default_pointer_grab_impl; -+extern const struct wlr_keyboard_grab_interface default_keyboard_grab_impl; -+extern const struct wlr_touch_grab_interface default_touch_grab_impl; - - void seat_client_create_pointer(struct wlr_seat_client *seat_client, - uint32_t version, uint32_t id); diff --git a/sources b/sources index 3c74977..fe3ae5f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (wlroots-0.10.1.tar.gz) = e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58 +SHA512 (wlroots-0.11.0.tar.gz) = a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575 +SHA512 (wlroots-0.11.0.tar.gz.sig) = eca87b05860b861cdd7bd16cefd80e9c8c023e1f9216b286c5438d52def5e722d509803cb69fb894b1bb18a86bab227cb1d19362813e1f278b9ac8713be4b4e1 diff --git a/wlroots.combined-modeset-and-enable-pr2167.patch b/wlroots.combined-modeset-and-enable-pr2167.patch deleted file mode 100644 index 053f9c8..0000000 --- a/wlroots.combined-modeset-and-enable-pr2167.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d73e0cdb47cd6950baa1651f8af63dcee1ee8690 Mon Sep 17 00:00:00 2001 -From: Simon Ser -Date: Thu, 7 May 2020 11:30:28 +0200 -Subject: [PATCH] backend/drm: fix combined modeset+enable commits - -When an output is enabled and modeset at the same time, -drm_connector_commit would first try to modeset then try to commit. This -won't work because both will trigger a page-flip. KMS will reject that. - -Change the logic to only enable an output if no modeset has been -requested. The logic in wlr_output already checks that the user isn't -doing a modeset and disabling the output at the same time. ---- - backend/drm/drm.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/backend/drm/drm.c b/backend/drm/drm.c -index f06b0600b..ebaaa8795 100644 ---- a/backend/drm/drm.c -+++ b/backend/drm/drm.c -@@ -529,9 +529,7 @@ static bool drm_connector_commit(struct wlr_output *output) { - } - break; - } -- } -- -- if (output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { -+ } else if (output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { - if (!enable_drm_connector(output, output->pending.enabled)) { - return false; - } diff --git a/wlroots.spec b/wlroots.spec index 9fc6c21..efc57cc 100644 --- a/wlroots.spec +++ b/wlroots.spec @@ -1,9 +1,9 @@ # Version of the .so library -%global abi_ver 5 +%global abi_ver 6 Name: wlroots -Version: 0.10.1 -Release: 2%{?dist} +Version: 0.11.0 +Release: 1%{?dist} Summary: A modular Wayland compositor library # Source files/overall project licensed as MIT, but @@ -29,24 +29,17 @@ Source2: gpgkey-7BC79407090047CA-52CB6609B22DA89A.gpg # - only has targets for examples known to compile well (cf. "examples) global) Source3: examples.meson.build -# Fix build with GCC 10 (-fno-common); upstreamed in next release -Patch: https://github.com/swaywm/wlroots/commit/f2943bdf61afe0a3ad2227d72fcbcac8b3088b1a.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1829212 -# https://github.com/swaywm/wlroots/pull/2167 -Patch: wlroots.combined-modeset-and-enable-pr2167.patch - BuildRequires: gcc BuildRequires: gnupg2 -BuildRequires: meson >= 0.51.2 +BuildRequires: meson >= 0.54.0 # FIXME: wlroots require `pkgconfig(egl)`, but assumes mesa provides it # (and uses it's extension header `). # Upstream is working on not needing that: https://github.com/swaywm/wlroots/issues/1899 # Until it is fixed, pull mesa-libEGL-devel manually -BuildRequires: pkgconfig(egl) mesa-libEGL-devel +BuildRequires: (mesa-libEGL-devel if libglvnd-devel < 1:1.3.2) +BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) >= 17.1.0 BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(libcap) BuildRequires: pkgconfig(libdrm) >= 2.4.95 BuildRequires: pkgconfig(libinput) >= 1.9.0 BuildRequires: pkgconfig(libsystemd) >= 237 @@ -56,7 +49,7 @@ BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-protocols) >= 1.17 BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.16 +BuildRequires: pkgconfig(wayland-server) >= 1.18 BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-icccm) @@ -74,7 +67,7 @@ BuildRequires: pkgconfig(xkbcommon) Summary: Development files for %{name} Requires: %{name}%{?_isa} == %{version}-%{release} # FIXME: See the rationale above for this require; remove when no longer needed -Requires: mesa-libEGL-devel +Requires: (mesa-libEGL-devel if libglvnd-devel < 1:1.3.2) # not required per se, so not picked up automatically by RPM Recommends: pkgconfig(xcb-icccm) # for examples @@ -96,6 +89,8 @@ MESON_OPTIONS=( # Disable options requiring extra/unpackaged dependencies -Dexamples=false -Dxcb-errors=disabled + # select systemd logind provider + -Dlogind-provider=systemd %ifarch s390x # Disable -Werror on s390x: https://github.com/swaywm/wlroots/issues/2018 @@ -136,6 +131,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build %changelog +* Wed Jul 15 2020 Aleksei Bavshin - 0.11.0-1 +- Updated to version 0.11.0 + * Sat May 09 2020 Till Hofmann - 0.10.1-2 - Add patch from upstream #2167 to fix #1829212