Accepting request 828237 from 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). (forwarded request 828234 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/828237
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=155
This commit is contained in:
Dominique Leuenberger 2020-08-23 07:20:54 +00:00 committed by Git OBS Bridge
commit 05feac7fb7
3 changed files with 43 additions and 0 deletions

View File

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

View File

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

View File

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