diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /x11-wm/mutter/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'x11-wm/mutter/files')
-rw-r--r-- | x11-wm/mutter/files/3.32-eglmesaext-include.patch | 68 | ||||
-rw-r--r-- | x11-wm/mutter/files/3.34.6-XInitThreads.patch | 50 |
2 files changed, 0 insertions, 118 deletions
diff --git a/x11-wm/mutter/files/3.32-eglmesaext-include.patch b/x11-wm/mutter/files/3.32-eglmesaext-include.patch deleted file mode 100644 index c91c56235f31..000000000000 --- a/x11-wm/mutter/files/3.32-eglmesaext-include.patch +++ /dev/null @@ -1,68 +0,0 @@ -From a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -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 -- 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/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 <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * 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 <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -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 <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () --- -2.22.0 - diff --git a/x11-wm/mutter/files/3.34.6-XInitThreads.patch b/x11-wm/mutter/files/3.34.6-XInitThreads.patch deleted file mode 100644 index f53f6ba93970..000000000000 --- a/x11-wm/mutter/files/3.34.6-XInitThreads.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8b3f1117be1e90866747fa9c9e7ae1c5812ba918 Mon Sep 17 00:00:00 2001 -From: Daniel van Vugt <daniel.van.vugt@canonical.com> -Date: Thu, 14 May 2020 18:13:56 +0800 -Subject: [PATCH] backend-x11: Reintroduce XInitThreads - -It was removed in 3.34 as part of 6ed5d2e2. And we thought that was the -only thread that might exist and use X11. But the top gnome-shell crasher -in 3.36 seems to suggest otherwise. - -We don't know what or where the offending thread is, but since: - - 1. We used XInitThreads for years already prior to 3.34; and - - 2. Extensions or any change to mutter/gnome-shell could conceivably use - threads to make X calls, directly or indirectly, - -it's probably a good idea to reintroduce XInitThreads. The failing assertion -in libx11 is also accompanied by a strong hint: - -``` -fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \ - "and XInitThreads has not been called\n"); -``` - -https://bugs.launchpad.net/bugs/1877075 - -Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1252 - -https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1256 - -(cherry picked from commit 1d5f9b6917517d6e777a652cfa5e648794dc632a) ---- - src/backends/x11/meta-backend-x11.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c -index 225d14d33..539ca5348 100644 ---- a/src/backends/x11/meta-backend-x11.c -+++ b/src/backends/x11/meta-backend-x11.c -@@ -859,6 +859,7 @@ meta_backend_x11_class_init (MetaBackendX11Class *klass) - static void - meta_backend_x11_init (MetaBackendX11 *x11) - { -+ XInitThreads (); - } - - Display * --- -2.20.1 - |