From 8e455e5e3a583503e08b0299689c5061f803e7832e648ca3be3f43dd4a04335d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Feb 2020 12:38:59 +0000 Subject: [PATCH 1/2] 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 \n#include ' ++ cogl_egl_includes_string = '#include \n#include \n#include ' + 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 + +- mutter-fix-mesa20.patch + * fixes build against Mesa 20 (boo#1164688) + ------------------------------------------------------------------- Sun Feb 16 17:03:28 UTC 2020 - Bjørn Lie 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 \ From 2f970396b9df4f8a43fc889549ccf6320fe6f184bd1a5806dcfee6b8f292c1a3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Feb 2020 12:46:46 +0000 Subject: [PATCH 2/2] - Rework mutter-fix-mesa20.patch: base it on mutter upstream commit a444a4c. - Add mutter-fix-mesa20.patch: fixes build against Mesa 20 (boo#1164688). OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=339 --- mutter-fix-mesa20.patch | 65 ++++++++++++++++++++++++++++++++++++++--- mutter.changes | 10 +++++-- mutter.spec | 6 ++-- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/mutter-fix-mesa20.patch b/mutter-fix-mesa20.patch index 427e02a..20f1f68 100644 --- a/mutter-fix-mesa20.patch +++ b/mutter-fix-mesa20.patch @@ -1,7 +1,24 @@ -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 @@ +From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: [PATCH] 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 +--- + cogl/cogl/meson.build | 2 +- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build +index 261955796..b0e66bff3 100644 +--- a/cogl/cogl/meson.build ++++ b/cogl/cogl/meson.build +@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( built_headers += [cogl_gl_header_h] if have_egl @@ -10,3 +27,43 @@ diff -u -r mutter-3.34.4.orig/cogl/cogl/meson.build mutter-3.34.4/cogl/cogl/meso else cogl_egl_includes_string = '' endif +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d5b..db0b74f76 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * 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 6554be935..fdeff4f77 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index f2a816445..4591e7d85 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () +-- +2.24.1 + + diff --git a/mutter.changes b/mutter.changes index 4f84d0d..8ec23d1 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,8 +1,14 @@ +------------------------------------------------------------------- +Tue Feb 25 12:39:26 UTC 2020 - Dominique Leuenberger + +- Rework mutter-fix-mesa20.patch: base it on mutter upstream commit + a444a4c. + ------------------------------------------------------------------- Mon Feb 24 15:19:59 UTC 2020 - Stefan Dirsch -- mutter-fix-mesa20.patch - * fixes build against Mesa 20 (boo#1164688) +- Add mutter-fix-mesa20.patch: fixes build against Mesa 20 + (boo#1164688). ------------------------------------------------------------------- Sun Feb 16 17:03:28 UTC 2020 - Bjørn Lie diff --git a/mutter.spec b/mutter.spec index 8a9e798..782a461 100644 --- a/mutter.spec +++ b/mutter.spec @@ -35,6 +35,8 @@ Source: %{name}-%{version}.tar.xz Patch3: mutter-Lower-HIDPI_LIMIT-to-144.patch # PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there Patch4: mutter-disable-cvt-s390x.patch +# PATCH-FIX-UPSTREAM mutter-fix-mesa20.patch sndirsch@suse.de -- EGL: Include EGL/eglmesaext.h +Patch5: mutter-fix-mesa20.patch ## SLE-only patches start at 1000 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. Patch1000: mutter-SLE-bell.patch @@ -42,7 +44,6 @@ 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 @@ -156,6 +157,7 @@ applications that want to make use of the mutter library. %setup -q %patch3 -p1 %patch4 -p1 +%patch5 -p1 # SLE-only patches and translations. translation-update-upstream po mutter @@ -165,8 +167,6 @@ translation-update-upstream po mutter # %patch1002 -p1 %endif -%patch1100 -p1 - %build %define _lto_cflags %{nil} %meson \