diff -Nru mutter-3.28.4+git20200505/debian/changelog mutter-3.28.4+git20200505/debian/changelog
--- mutter-3.28.4+git20200505/debian/changelog	2020-05-05 19:50:40.000000000 +0000
+++ mutter-3.28.4+git20200505/debian/changelog	2020-09-23 19:29:30.000000000 +0000
@@ -1,3 +1,10 @@
+mutter (3.28.4+git20200505-0ubuntu18.04.2) bionic; urgency=medium
+
+  * debian/patches: Cherry-pick patch to make mutter compile with newer mesa
+    (LP: #1896825)
+
+ -- Marco Trevisan (Treviño) <marco@ubuntu.com>  Wed, 23 Sep 2020 21:29:30 +0200
+
 mutter (3.28.4+git20200505-0ubuntu18.04.1) bionic; urgency=medium
 
   * New upstream git snapsnot
diff -Nru mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch
--- mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch	1970-01-01 00:00:00.000000000 +0000
+++ mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch	2020-09-23 19:29:30.000000000 +0000
@@ -0,0 +1,93 @@
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 20 Oct 2019 12:04:31 +0200
+Subject: EGL: Include EGL/eglmesaext.h
+
+The eglext.h shipped by libglvnd does not include the Mesa extensions,
+unlike the header shipped in Mesa.
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/commits/gnome-3-28
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1896825
+---
+ cogl/configure.ac           | 13 ++++++++++---
+ src/backends/meta-egl-ext.h |  1 +
+ src/backends/meta-egl.c     |  1 +
+ src/backends/meta-egl.h     |  1 +
+ 4 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/cogl/configure.ac b/cogl/configure.ac
+index 3be282f..7c72d81 100644
+--- a/cogl/configure.ac
++++ b/cogl/configure.ac
+@@ -485,9 +485,10 @@ AS_IF([test "x$enable_gles1" = "xyes"],
+                   [AC_MSG_ERROR([Unable to locate EGL header])])
+             AC_SUBST([COGL_EGL_INCLUDES])
+ 
+-            AC_CHECK_HEADERS([EGL/eglext.h],
++            AC_CHECK_HEADERS([EGL/eglext.h EGL/eglmesaext.h],
+                              [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE
+-#include <EGL/eglext.h>"],
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"],
+                              [],
+                              [$COGL_EGL_INCLUDES])
+ 
+@@ -749,6 +750,11 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+               [],
+               [AC_MSG_ERROR([Unable to locate required EGL headers])],
+               [#include <EGL/egl.h>])
++            AC_CHECK_HEADERS(
++              [EGL/eglmesaext.h],
++              [],
++              [AC_MSG_ERROR([Unable to locate required EGL headers])],
++              [#include <EGL/eglmesaext.h>])
+ 
+             AC_CHECK_LIB(EGL, [eglInitialize],
+               [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"],
+@@ -759,7 +765,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"],
+           )
+ 
+         COGL_EGL_INCLUDES="#include <EGL/egl.h>
+-#include <EGL/eglext.h>"
++#include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>"
+         AC_SUBST([COGL_EGL_INCLUDES])
+       ])
+ 
+diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h
+index 8705e7d..db0b74f 100644
+--- a/src/backends/meta-egl-ext.h
++++ b/src/backends/meta-egl-ext.h
+@@ -29,6 +29,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ 
+ /*
+  * This is a little different to the tests shipped with EGL implementations,
+diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c
+index 755ec49..bd253c9 100644
+--- a/src/backends/meta-egl.c
++++ b/src/backends/meta-egl.c
+@@ -31,6 +31,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <gio/gio.h>
+ #include <glib.h>
+ #include <glib-object.h>
+diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h
+index 060c7cd..2fef264 100644
+--- a/src/backends/meta-egl.h
++++ b/src/backends/meta-egl.h
+@@ -27,6 +27,7 @@
+ 
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
++#include <EGL/eglmesaext.h>
+ #include <glib-object.h>
+ 
+ #define META_EGL_ERROR meta_egl_error_quark ()
diff -Nru mutter-3.28.4+git20200505/debian/patches/series mutter-3.28.4+git20200505/debian/patches/series
--- mutter-3.28.4+git20200505/debian/patches/series	2020-05-05 19:50:40.000000000 +0000
+++ mutter-3.28.4+git20200505/debian/patches/series	2020-09-23 19:29:30.000000000 +0000
@@ -1,3 +1,4 @@
+EGL-Include-EGL-eglmesaext.h.patch
 theme-use-gtk_render_icon_suface-to-paint-button-icon.patch
 theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
 clutter-Fix-offscreen-effect-painting-of-clones.patch