From 47bea842b1645b35d93c5058033b84c321eb5a23b717c888fcc3d6260285b1c6 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 20 Aug 2020 15:44:16 +0000
Subject: [PATCH] Accepting request 828234 from
home:fcrozat:branches:GNOME:Factory
- Add mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch:
don't use libGLESv2.so but libGLESv2.so.2 for COGL driver
(boo#1175559 glgo#GNOME/mutter!1282).
OBS-URL: https://build.opensuse.org/request/show/828234
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=359
---
...e-libGLESv2.so.2-for-COGL_DRIVER-gle.patch | 33 +++++++++++++++++++
mutter.changes | 7 ++++
mutter.spec | 3 ++
3 files changed, 43 insertions(+)
create mode 100644 mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch
diff --git a/mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch b/mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch
new file mode 100644
index 0000000..135e9ed
--- /dev/null
+++ b/mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch
@@ -0,0 +1,33 @@
+From dfe33897db0989635e4a789290dd2a73da39ca5c Mon Sep 17 00:00:00 2001
+From: Daniel van Vugt <daniel.van.vugt@canonical.com>
+Date: Tue, 9 Jun 2020 18:25:59 +0800
+Subject: [PATCH] meson_options: Use libGLESv2.so.2 for COGL_DRIVER=gles2, not
+ libGLESv2.so
+
+The former is present on any system that supports OpenGL|ES 2. The latter
+is just provided in developer packages. Since we access the library via
+`g_module_open` it's safe to just rely on `libGLESv2.so.2`.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1282
+
+https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1298
+---
+ meson_options.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index 75a1961e4..655ef433f 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -12,7 +12,7 @@ option('opengl_libname',
+
+ option('gles2_libname',
+ type: 'string',
+- value: 'libGLESv2.so',
++ value: 'libGLESv2.so.2',
+ description: 'GLESv2 library file name'
+ )
+
+--
+2.26.2
+
diff --git a/mutter.changes b/mutter.changes
index 72eb646..0e00b6a 100644
--- a/mutter.changes
+++ b/mutter.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 20 15:34:43 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
+
+- Add mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch:
+ don't use libGLESv2.so but libGLESv2.so.2 for COGL driver
+ (boo#1175559 glgo#GNOME/mutter!1282).
+
-------------------------------------------------------------------
Wed Aug 12 21:08:16 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
diff --git a/mutter.spec b/mutter.spec
index ac8e73e..aaaa8bb 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-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch boo#1175559 glgo#GNOME/mutter!1282 fcrozat@suse.com -- Fix loading libGLESv2.so.2
+Patch5: mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.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.
@@ -156,6 +158,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