From 8e455e5e3a583503e08b0299689c5061f803e7832e648ca3be3f43dd4a04335d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 25 Feb 2020 12:38:59 +0000
Subject: [PATCH] Accepting request 778810 from
 home:sndirsch:branches:GNOME:Factory

- mutter-fix-mesa20.patch
  * fixes build against Mesa 20 (boo#1164688)

OBS-URL: https://build.opensuse.org/request/show/778810
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=338
---
 mutter-fix-mesa20.patch | 12 ++++++++++++
 mutter.changes          |  6 ++++++
 mutter.spec             |  3 +++
 3 files changed, 21 insertions(+)
 create mode 100644 mutter-fix-mesa20.patch

diff --git a/mutter-fix-mesa20.patch b/mutter-fix-mesa20.patch
new file mode 100644
index 0000000..427e02a
--- /dev/null
+++ b/mutter-fix-mesa20.patch
@@ -0,0 +1,12 @@
+diff -u -r mutter-3.34.4.orig/cogl/cogl/meson.build mutter-3.34.4/cogl/cogl/meson.build
+--- mutter-3.34.4.orig/cogl/cogl/meson.build	2020-02-24 16:26:55.550607420 +0100
++++ mutter-3.34.4/cogl/cogl/meson.build	2020-02-24 16:28:39.528632031 +0100
+@@ -48,7 +48,7 @@
+ built_headers += [cogl_gl_header_h]
+ 
+ if have_egl
+-  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>'
++  cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>'
+ else
+   cogl_egl_includes_string = ''
+ endif
diff --git a/mutter.changes b/mutter.changes
index b244807..4f84d0d 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 24 15:19:59 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- mutter-fix-mesa20.patch 
+  * fixes build against Mesa 20 (boo#1164688) 
+
 -------------------------------------------------------------------
 Sun Feb 16 17:03:28 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/mutter.spec b/mutter.spec
index dc31d20..8a9e798 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -42,6 +42,7 @@ Patch1000:      mutter-SLE-bell.patch
 Patch1001:      mutter-SLE-relax-some-constraints-on-CSD-windows.patch
 # PATCH-NEEDS-REBASE mutter-SLE-bsc984738-grab-display.patch bsc#984738 bgo#769387 hpj@suse.com -- Revert a upstream commit to avoid X11 race condition that results in wrong dialog sizes.
 Patch1002:      mutter-SLE-bsc984738-grab-display.patch
+Patch1100:      mutter-fix-mesa20.patch
 
 BuildRequires:  Mesa-libGLESv3-devel
 BuildRequires:  cmake
@@ -164,6 +165,8 @@ translation-update-upstream po mutter
 # %patch1002 -p1
 %endif
 
+%patch1100 -p1
+
 %build
 %define _lto_cflags %{nil}
 %meson \