aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <ollieparanoid@postmarketos.org>2020-10-29 11:59:24 +0100
committerKevin Daudt <kdaudt@alpinelinux.org>2020-10-29 16:40:25 +0000
commit7f001553b4abddb7a22dc2cc2c9ce90aa3a17aca (patch)
tree7da5ef8ccfa5def69ff383eae433c85bf52adccc
parentfec13a3d19663afe594f282807284cad4d022e25 (diff)
downloadaports-7f001553b4abddb7a22dc2cc2c9ce90aa3a17aca.tar.gz
aports-7f001553b4abddb7a22dc2cc2c9ce90aa3a17aca.tar.bz2
aports-7f001553b4abddb7a22dc2cc2c9ce90aa3a17aca.tar.xz
community/wlroots: backport patch for phosh 0.5.0
Add patch from wlroots master, which is needed for phosh 0.5.0 (already in Alpine edge).
-rw-r--r--community/wlroots/0001-output-management-v1-send-complete-head-state-on-ena.patch36
-rw-r--r--community/wlroots/APKBUILD9
2 files changed, 42 insertions, 3 deletions
diff --git a/community/wlroots/0001-output-management-v1-send-complete-head-state-on-ena.patch b/community/wlroots/0001-output-management-v1-send-complete-head-state-on-ena.patch
new file mode 100644
index 0000000000..7e31fa54e9
--- /dev/null
+++ b/community/wlroots/0001-output-management-v1-send-complete-head-state-on-ena.patch
@@ -0,0 +1,36 @@
+Upstream: yes
+
+From 86c0b9986b82a477dea7e6029c0fe565dd7af429 Mon Sep 17 00:00:00 2001
+From: Roman Gilg <subdiff@gmail.com>
+Date: Thu, 1 Oct 2020 14:32:57 +0200
+Subject: [PATCH] output-management-v1: send complete head state on
+ enable change
+
+The data of a head is only sent when it is enabled. While the head was disabled
+data might have been changed. In this case clients were not informed about this
+change. A later enable change that does not also update the other data must
+still lead to the propagation of this data.
+
+Since we do not know what other data was changed while the head was disabled
+just send together with an enable change all current data.
+---
+ types/wlr_output_management_v1.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/types/wlr_output_management_v1.c b/types/wlr_output_management_v1.c
+index ae20e0d7..728abee7 100644
+--- a/types/wlr_output_management_v1.c
++++ b/types/wlr_output_management_v1.c
+@@ -680,6 +680,9 @@ static void head_send_state(struct wlr_output_head_v1 *head,
+
+ if (state & HEAD_STATE_ENABLED) {
+ zwlr_output_head_v1_send_enabled(head_resource, head->state.enabled);
++ // On enabling we send all current data since clients have not been
++ // notified about potential data changes while the head was disabled.
++ state = HEAD_STATE_ALL;
+ }
+
+ if (!head->state.enabled) {
+--
+2.20.1
+
diff --git a/community/wlroots/APKBUILD b/community/wlroots/APKBUILD
index fee1343ef6..c4167e846e 100644
--- a/community/wlroots/APKBUILD
+++ b/community/wlroots/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=wlroots
pkgver=0.11.0
-pkgrel=1
+pkgrel=2
pkgdesc="A modular Wayland compositor library"
url="https://github.com/swaywm/wlroots"
arch="all"
@@ -26,7 +26,9 @@ makedepends="
xkeyboard-config
"
subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/wlroots/archive/$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/swaywm/wlroots/archive/$pkgver.tar.gz
+ 0001-output-management-v1-send-complete-head-state-on-ena.patch
+ "
build() {
abuild-meson \
@@ -41,4 +43,5 @@ package() {
DESTDIR="$pkgdir" meson install --no-rebuild -C build
}
-sha512sums="a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575 wlroots-0.11.0.tar.gz"
+sha512sums="a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575 wlroots-0.11.0.tar.gz
+60b50e69a93607f025fdff67e3f71f7b8925a0a1a2365ae8aa5f6f04ef169e66c69044ce09ac0287fa3a37e409aeed3f385505b7cfba6120cbc7455754e91007 0001-output-management-v1-send-complete-head-state-on-ena.patch"