Upgrade Mutter to version 41.3

3 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4961e97d87d3..8159f6c15eee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mutter-dynamic-buffering
 	pkgdesc = A window manager for GNOME (with dynamic triple/double buffering)
-	pkgver = 41.2
+	pkgver = 41.3
 	pkgrel = 1
 	url = https://gitlab.gnome.org/GNOME/mutter
 	arch = x86_64
@@ -15,6 +15,7 @@ pkgbase = mutter-dynamic-buffering
 	makedepends = meson
 	makedepends = xorg-server
 	makedepends = wayland-protocols
+	makedepends = sysprof
 	depends = dconf
 	depends = gobject-introspection-runtime
 	depends = gsettings-desktop-schemas
@@ -32,14 +33,15 @@ pkgbase = mutter-dynamic-buffering
 	depends = xorg-xwayland
 	depends = graphene
 	depends = libxkbfile
+	depends = libsysprof-capture
 	provides = mutter
 	provides = libmutter-9.so
 	conflicts = mutter
-	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=664ac09eecfd365b5258f53d2c9e6c8410a37919
+	source = mutter-dynamic-buffering::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=f51ad2911419ee2ab88b5548581227a57d0fd987
 	source = backports.patch
 	source = mr1441.patch
 	sha256sums = SKIP
 	sha256sums = 650e2d88bad9226be7cde62974b3a39a99d63156d0fe61df6bc54887481a1b51
-	sha256sums = 592c03f4a492d39d760b174e487b3b2a58e9caef9b9ef886f5aa09abb94b69d3
+	sha256sums = cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7
 
 pkgname = mutter-dynamic-buffering
diff --git a/PKGBUILD b/PKGBUILD
index 0c03c60f8c91..c899a8ac55b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter-dynamic-buffering
-pkgver=41.2
+pkgver=41.3
 pkgrel=1
 pkgdesc="A window manager for GNOME (with dynamic triple/double buffering)"
 url="https://gitlab.gnome.org/GNOME/mutter"
@@ -13,21 +13,21 @@ 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
-         xorg-xwayland graphene libxkbfile)
+         xorg-xwayland graphene libxkbfile libsysprof-capture)
 makedepends=(gobject-introspection git egl-wayland meson xorg-server
-             wayland-protocols)
+             wayland-protocols sysprof)
 checkdepends=(xorg-server-xvfb pipewire-media-session python-dbusmock)
 provides=(mutter libmutter-9.so)
 conflicts=(mutter)
 groups=(gnome)
-_commit=664ac09eecfd365b5258f53d2c9e6c8410a37919  # tags/41.2^0
+_commit=f51ad2911419ee2ab88b5548581227a57d0fd987  # tags/41.3^0
 source=("$pkgname::git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit"
         'backports.patch'
         'mr1441.patch')
 
 sha256sums=('SKIP'
             '650e2d88bad9226be7cde62974b3a39a99d63156d0fe61df6bc54887481a1b51'
-            '592c03f4a492d39d760b174e487b3b2a58e9caef9b9ef886f5aa09abb94b69d3')
+            'cf99896763558258f489ff0e9a1e8001f716d63b06366f740e044cc72a71d3e7')
 
 pkgver() {
   cd $pkgname
@@ -47,7 +47,6 @@ build() {
     -D egl_device=true \
     -D wayland_eglstream=true \
     -D installed_tests=false \
-    -D profiler=false \
     -D tests=false
   meson compile -C build
 }
@@ -69,7 +68,7 @@ _check_internal() (
 )
 
 _check_disabled() {
-  dbus-run-session xvfb-run -s '-nolisten local' \
+  dbus-run-session xvfb-run -s '-nolisten local +iglx -noreset' \
     bash -c "$(declare -f _check_internal); _check_internal"
 }
 
diff --git a/mr1441.patch b/mr1441.patch
index e54521258a25..90806337a369 100644
--- a/mr1441.patch
+++ b/mr1441.patch
@@ -1372,11 +1372,10 @@ index 00b2d9f89..eb1e7412a 100644
    kms_update = meta_kms_get_pending_update (kms, kms_device);
    if (!kms_update)
      {
-@@ -2095,8 +2094,6 @@ meta_onscreen_native_dispose (GObject *object)
-       /* flip state takes a reference on the onscreen so there should
-        * never be outstanding flips when we reach here. */
-       g_warn_if_fail (onscreen_native->gbm.next_fb == NULL);
--
+@@ -2096,7 +2094,6 @@ meta_onscreen_native_dispose (GObject *object)
+     {
+     case META_RENDERER_NATIVE_MODE_GBM:
+       g_clear_object (&onscreen_native->gbm.next_fb);
 -      free_current_bo (onscreen);
        break;
      case META_RENDERER_NATIVE_MODE_SURFACELESS: