3.30.0

2 files changed, 11 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4a9ff7b6be2..2a4460598172 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 # Generated by mksrcinfo v8
-# Mon Aug 20 14:25:36 UTC 2018
+# Mon Sep 17 19:31:55 UTC 2018
 pkgbase = mutter-catalyst
 	pkgdesc = A window manager for GNOME with patches for catalyst compatibility
-	pkgver = 3.28.3+8+gd0d807801
+	pkgver = 3.30.0
 	pkgrel = 1
-	url = https://git.gnome.org/browse/mutter
+	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
 	groups = gnome
 	license = GPL
@@ -25,10 +25,11 @@ pkgbase = mutter-catalyst
 	depends = libgudev
 	depends = libinput
 	depends = pipewire
-	provides = mutter=3.28.3+8+gd0d807801
+	depends = egl-wayland
+	provides = mutter=3.30.0
 	conflicts = mutter
-	conflicts = gnome-shell>3.28.3+999
-	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=d0d8078013749bb84dc611dfdf6b317512c8559e
+	conflicts = gnome-shell>3.30.0+999
+	source = git+https://gitlab.gnome.org/GNOME/mutter.git#commit=34f5be726dbd90ad6c494cda5eeff7bd68fd83a1
 	source = startup-notification.patch
 	source = catalyst-workaround-v2.patch
 	source = catalyst mutter cogl.patch
diff --git a/PKGBUILD b/PKGBUILD
index 92e74fc51ea4..95bfb7ccf130 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,10 @@
 
 _realname=mutter
 pkgname=$_realname-catalyst
-pkgver=3.28.3+8+gd0d807801
+pkgver=3.30.0
 pkgrel=1
 pkgdesc="A window manager for GNOME with patches for catalyst compatibility"
-url="https://git.gnome.org/browse/mutter"
+url="https://gitlab.gnome.org/GNOME/mutter"
 arch=(x86_64)
 license=('GPL')
 depends=('dconf'
@@ -25,6 +25,7 @@ depends=('dconf'
   'libgudev'
   'libinput'
   'pipewire'
+  'egl-wayland'
 )
 makedepends=('intltool'
   'gobject-introspection'
@@ -33,7 +34,7 @@ makedepends=('intltool'
 conflicts=('mutter' "gnome-shell>${pkgver:0:6}+999")
 provides=("mutter=${pkgver}")
 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"
   "catalyst-workaround-v2.patch"
@@ -51,10 +52,6 @@ pkgver() {
 prepare() {
   cd "$_realname"
 
-  # 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