hmm

3 files changed, 49 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0a2c017a091..5d5ff17c3ea3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutter-performance
 	pkgdesc = A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync
-	pkgver = 3.34.1+33+g34b5a07d5
+	pkgver = 3.34.1+52+g403d8fcc6
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
@@ -32,9 +32,11 @@ pkgbase = mutter-performance
 	provides = mutter-781835-workaround
 	conflicts = mutter
 	replaces = mutter-781835-workaround
-	source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=34b5a07d58b9a6ef525f648477b5f46ccd6ab359
+	source = mutter-performance::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=403d8fcc6624f5d027dd599c934411e71d248754
+	source = 918.patch
 	source = fix-build.patch
 	sha256sums = SKIP
+	sha256sums = 775fbcd209a170b6ca13326367ef62b8d35acff16019553c40eb24f0684c3495
 	sha256sums = 28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935
 
 pkgname = mutter-performance
diff --git a/918.patch b/918.patch
new file mode 100644
index 000000000000..a59a483421bd
--- /dev/null
+++ b/918.patch
@@ -0,0 +1,33 @@
+From 1b26e414eccc33e26c464b282739315cb24f8f38 Mon Sep 17 00:00:00 2001
+From: Robert Mader <robert.mader@posteo.de>
+Date: Mon, 4 Nov 2019 11:45:13 +0100
+Subject: [PATCH] surface-actor-wayland: Do not send frame callbacks if the
+ actor is obscured
+
+`meta_surface_actor_is_obscured` implies that the actor got successfully culled
+out and nothing of it will get painted. This includes that there are no clones,
+no effects etc. In this cases we don't want to send frame callbacks, thus avoiding
+unnecessary client work.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/918
+---
+ src/compositor/meta-surface-actor-wayland.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/compositor/meta-surface-actor-wayland.c b/src/compositor/meta-surface-actor-wayland.c
+index 0b1c4ef01..e0335348f 100644
+--- a/src/compositor/meta-surface-actor-wayland.c
++++ b/src/compositor/meta-surface-actor-wayland.c
+@@ -103,6 +103,9 @@ meta_surface_actor_wayland_paint (ClutterActor *actor)
+ {
+   MetaSurfaceActorWayland *self = META_SURFACE_ACTOR_WAYLAND (actor);
+ 
++  if (meta_surface_actor_is_obscured (META_SURFACE_ACTOR (actor)))
++    return;
++
+   if (self->surface)
+     {
+       MetaWaylandCompositor *compositor = self->surface->compositor;
+-- 
+2.22.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 0be1b2774b13..e7dc2aa6fb44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,14 @@
 
 ### MERGE REQUESTS SELECTION
 
-# available MR: ('!429' '!493' '!575' '!579' !719 '!724' '!762' '!909')
+# available MR: ('!429' '!493' '!575' '!579' !719 '!724' '!762')
+# _merge_requests_to_use=('!493' '!575' '!579' !719 '!724' '!762')
 _merge_requests_to_use=('!575' '!724' '!909')
 
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgname=mutter-performance
-pkgver=3.34.1+33+g34b5a07d5
+pkgver=3.34.1+52+g403d8fcc6
 pkgrel=1
 pkgdesc="A window manager for GNOME | Attempts to improve performances with non-upstreamed merge-requests and frequent stable branch resync"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -29,13 +30,14 @@ provides=(mutter mutter-781835-workaround)
 conflicts=(mutter)
 replaces=(mutter-781835-workaround)
 groups=(gnome)
-_commit=34b5a07d58b9a6ef525f648477b5f46ccd6ab359  # master
+_commit=403d8fcc6624f5d027dd599c934411e71d248754  # gnome-3-34
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
-	fix-build.patch)
+        918.patch
+        fix-build.patch)
 sha256sums=('SKIP'
+            '775fbcd209a170b6ca13326367ef62b8d35acff16019553c40eb24f0684c3495'
             '28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935')
 
-
 pkgver() {
   cd $pkgname
   git describe --tags | sed 's/-/+/g'
@@ -80,11 +82,14 @@ prepare() {
   cd $pkgname
 
   ### Adding and fetching remotes providing the selected merge-requests
+  git reset --hard
   git cherry-pick --abort || true
   git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true
+  # git remote add verdre https://gitlab.gnome.org/verdre/mutter.git || true # !429
   git remote add 3v1no https://gitlab.gnome.org/3v1n0/mutter.git || true
 
   git fetch vanvugt
+  # git fetch verdre
   git fetch 3v1no
 
   ### Merge Requests
@@ -154,12 +159,8 @@ prepare() {
   pick_mr '!719' 97140ab6346bd29208e99c9c9aab892c2eec0e52 'revert'
   pick_mr '!762' e9ba9dc2 'merge'
 
-  # Title: x11-display: Don't unset the X11 focused window after setting one
-  # URL: https://gitlab.gnome.org/GNOME/mutter/merge_requests/909
-  # Type: 3
-  # Status: 2
-  # Comment:
-  pick_mr '!909' b1b7c597^..765c8a3a 'merge'
+  # https://gitlab.gnome.org/GNOME/mutter/merge_requests/918
+  git apply -3 ../918.patch
 
   patch -Np1 < ../fix-build.patch