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
This commit is contained in:
Dominique Leuenberger 2020-02-25 12:38:59 +00:00 committed by Git OBS Bridge
parent 19f573801d
commit 8e455e5e3a
3 changed files with 21 additions and 0 deletions

12
mutter-fix-mesa20.patch Normal file
View File

@ -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

View File

@ -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>

View File

@ -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 \