Sync to gnome-3-32, Prepare for !661

2 files changed, 15 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9897765d9b74..33e81104a114 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mutter-781835-workaround
 	pkgdesc = A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included.
-	pkgver = 3.32.2+11+ga3a97621b
-	pkgrel = 2
+	pkgver = 3.32.2+32+g947da2c5d
+	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
 	groups = gnome
@@ -30,7 +30,7 @@ pkgbase = mutter-781835-workaround
 	depends = gnome-shell
 	provides = mutter
 	conflicts = mutter
-	source = mutter-781835-workaround::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=a3a97621bea451878b8997bc1befc282584521fa
+	source = mutter-781835-workaround::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=947da2c5d583ea7ac743238fe0022f7c4a0d5356
 	sha256sums = SKIP
 
 pkgname = mutter-781835-workaround
diff --git a/PKGBUILD b/PKGBUILD
index a247694e7947..4f79f74ee14e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 
 pkgname=mutter-781835-workaround
-pkgver=3.32.2+14+ge0922bffe
+pkgver=3.32.2+32+g947da2c5d
 pkgrel=1
 pkgdesc="A window manager for GNOME. This package reverts a commit which may causes performance problems for nvidia driver users. Some performance patches also included."
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -21,7 +21,7 @@ checkdepends=(xorg-server-xvfb)
 provides=(mutter)
 conflicts=(mutter)
 groups=(gnome)
-_commit=e0922bffea44ed201dd0adf38bf3180b4a574fe2 # tags/3.32.2^14
+_commit=947da2c5d583ea7ac743238fe0022f7c4a0d5356 # tags/3.32.2^32
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit")
 sha256sums=('SKIP')
 
@@ -40,6 +40,11 @@ prepare() {
   git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true
   git fetch vanvugt
 
+  # Various Clutter cleanups
+  # https://gitlab.gnome.org/GNOME/mutter/merge_requests/666
+  # Needed so !189 doesn't conflict
+  git cherry-pick -n 5bd85ef7^..b0b1ff36
+
   # Geometric (OpenGL-less) picking
   # https://gitlab.gnome.org/GNOME/mutter/merge_requests/189
   git cherry-pick -n 76462a2f
@@ -61,6 +66,11 @@ prepare() {
   # still has issues with 1000Hz mice
   # git cherry-pick -n 657cb4b5
 
+  # clutter/stage: Process input events out of phase with redraws [performance]
+  # https://gitlab.gnome.org/GNOME/mutter/merge_requests/661/
+  # Replaces !168 but needs to be rebased
+  # git cherry-pick -n fbaa4dfa^..ec6a6e91
+
   # Resource scale computation optimizations
   # https://gitlab.gnome.org/GNOME/mutter/merge_requests/493
   git cherry-pick -n 3aa449af^..1017ce44