diff options
author | Mart Raudsepp <leio@gentoo.org> | 2019-12-23 23:23:56 +0200 |
---|---|---|
committer | Mart Raudsepp <leio@gentoo.org> | 2019-12-23 23:25:49 +0200 |
commit | 4d6e0c8fe87969bb3683e7f0e79891c54e4197a8 (patch) | |
tree | 8990dbf758df16a5b3577347a9b30679f84748db /x11-wm/mutter/files | |
parent | gnome-base/gnome-shell: remove old (diff) | |
download | gentoo-4d6e0c8fe87969bb3683e7f0e79891c54e4197a8.tar.gz gentoo-4d6e0c8fe87969bb3683e7f0e79891c54e4197a8.tar.bz2 gentoo-4d6e0c8fe87969bb3683e7f0e79891c54e4197a8.zip |
x11-wm/mutter: remove old
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'x11-wm/mutter/files')
-rw-r--r-- | x11-wm/mutter/files/3.28.3-no-gles2-fix.patch | 43 | ||||
-rw-r--r-- | x11-wm/mutter/files/3.30-eglmesaext-include.patch | 69 |
2 files changed, 0 insertions, 112 deletions
diff --git a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch b/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch deleted file mode 100644 index 43bb05f52458..000000000000 --- a/x11-wm/mutter/files/3.28.3-no-gles2-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 259544c4f4b47418885075c9531ce593c600401c Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Fri, 1 Mar 2019 00:02:47 +0200 -Subject: [PATCH] build: Fix build without gles headers - -This is an ugly quick fix to hopefully fix non-wayland builds against -mesa[-gles2]. -It assumes gnome-shell package USE=wayland requires USE=gles2, which it -sort of does already at runtime already for hybrid graphics support, but -we ensure with REQUIRED_USE. -In meson upstream port for 3.32 this will be more properly conditional -on the gles2 option instead. ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index bcb3505c7..a68661b21 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -118,9 +118,6 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES = \ - backends/meta-egl.c \ - backends/meta-egl.h \ - backends/meta-egl-ext.h \ -- backends/meta-gles3.c \ -- backends/meta-gles3.h \ -- backends/meta-gles3-table.h \ - backends/meta-gpu.c \ - backends/meta-gpu.h \ - backends/meta-display-config-shared.h \ -@@ -472,6 +469,9 @@ endif - - if HAVE_NATIVE_BACKEND - libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES += \ -+ backends/meta-gles3.c \ -+ backends/meta-gles3.h \ -+ backends/meta-gles3-table.h \ - backends/native/meta-backend-native.c \ - backends/native/meta-backend-native.h \ - backends/native/meta-backend-native-private.h \ --- -2.17.0 - diff --git a/x11-wm/mutter/files/3.30-eglmesaext-include.patch b/x11-wm/mutter/files/3.30-eglmesaext-include.patch deleted file mode 100644 index 884d57cc6f05..000000000000 --- a/x11-wm/mutter/files/3.30-eglmesaext-include.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 813ea4e5743920ecf325aac8efe420bd5fe3baf2 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/configure.ac | 3 ++- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/cogl/configure.ac b/cogl/configure.ac -index 3be282fc2..f333b0512 100644 ---- a/cogl/configure.ac -+++ b/cogl/configure.ac -@@ -759,7 +759,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include <EGL/egl.h> --#include <EGL/eglext.h>" -+#include <EGL/eglext.h> -+#include <EGL/eglmesaext.h>" - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - -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 755ec4908..bd253c956 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -31,6 +31,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 060c7cd2d..2fef2642e 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -27,6 +27,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.23.0 - |