3.30

2 files changed, 13 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5b7e7b89f9f..a6e31ddb74e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
 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.28.3+8+gd0d807801
-	pkgrel = 2
-	url = https://git.gnome.org/browse/mutter
+	pkgver = 3.30.0
+	pkgrel = 1
+	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
 	groups = gnome
 	license = GPL
 	makedepends = intltool
 	makedepends = gobject-introspection
 	makedepends = git
+	makedepends = egl-wayland
 	depends = dconf
 	depends = gobject-introspection-runtime
 	depends = gsettings-desktop-schemas
@@ -26,7 +27,7 @@ pkgbase = mutter-781835-workaround
 	depends = gnome-shell
 	provides = mutter
 	conflicts = mutter
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=d0d8078013749bb84dc611dfdf6b317512c8559e
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=34f5be726dbd90ad6c494cda5eeff7bd68fd83a1
 	source = startup-notification.patch
 	source = revert.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 71585d7c238b..9a272f8956d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
@@ -8,20 +7,20 @@
 
 pkgname=mutter-781835-workaround
 _pkgname=mutter
-pkgver=3.28.3+8+gd0d807801
-pkgrel=2
+pkgver=3.30.0
+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://git.gnome.org/browse/mutter"
+url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
 license=(GPL)
 depends=(dconf gobject-introspection-runtime gsettings-desktop-schemas libcanberra
          startup-notification zenity libsm gnome-desktop upower libxkbcommon-x11
          gnome-settings-daemon libgudev libinput pipewire gnome-shell) # or gnome-shell-performance=3.28.3+7+g721ce5403
-makedepends=(intltool gobject-introspection git)
+makedepends=(intltool gobject-introspection git egl-wayland)
 provides=(mutter)
 conflicts=(mutter)
 groups=(gnome)
-_commit=d0d8078013749bb84dc611dfdf6b317512c8559e  # gnome-3-28
+_commit=34f5be726dbd90ad6c494cda5eeff7bd68fd83a1 # tags/3.30.0^0
 source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
         startup-notification.patch
         revert.patch)
@@ -40,31 +39,15 @@ prepare() {
   ## Unmerged performance bits, enable with own risk and merge conflicts yourself
   # Multiline comment start, remove the line (and comment end line) below to enable the patches
   # : '
-  ## https://gitlab.gnome.org/GNOME/mutter/merge_requests/70/commits
-  ## This is reported to cause lower performance for some users. The commit will also be replaced in future
-  # git remote add vanvugt https://gitlab.gnome.org/vanvugt/mutter.git || true
-  # git fetch vanvugt
-  # git cherry-pick 13870745 || bash
-  # https://gitlab.gnome.org/GNOME/mutter/merge_requests/98/commits
-  git remote add carlosg https://gitlab.gnome.org/carlosg/mutter.git || true
-  git fetch carlosg
-  git cherry-pick ec813877 || bash
-  git cherry-pick 94f40098 || bash
-  git cherry-pick 161d2540 || bash
-  # https://gitlab.gnome.org/GNOME/mutter/merge_requests/145/commits
-  # This causes stutter on Intel iGPU (i7 8550u). Works fine for nv GPU from my experience
-  # git cherry-pick a4b62506 || bash
-  # git cherry-pick 2088061a || bash
+
+  # Empty as of now
+
   # '
   # Multiline comment end, remove the line above if enabling the patches
 
   # Revert offending commit
   patch -Np1 -i ../revert.patch
 
-  # Port to pipewire 0.2
-  git cherry-pick -n 0407a8b33d8c3503fba63ad260984bb08bd6e0dc
-  sed -i 's/pipewire-0.1/pipewire-0.2/g' configure.ac
-
   # https://bugs.archlinux.org/task/51940
   # As of 2018-05-08: Still needed, according to fmuellner
   patch -Np1 -i ../startup-notification.patch