diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /x11-wm/mutter/files | |
parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) |
gentoo resync : 14.05.2020
Diffstat (limited to 'x11-wm/mutter/files')
-rw-r--r-- | x11-wm/mutter/files/3.26.2-non-wayland-build.patch | 33 | ||||
-rw-r--r-- | x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch | 81 |
2 files changed, 0 insertions, 114 deletions
diff --git a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch b/x11-wm/mutter/files/3.26.2-non-wayland-build.patch deleted file mode 100644 index a2a8d356e07e..000000000000 --- a/x11-wm/mutter/files/3.26.2-non-wayland-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6cc48d8cbbf11fa82ec78cac0b29d52f05eabb60 Mon Sep 17 00:00:00 2001 -From: Ting-Wei Lan <lantw@src.gnome.org> -Date: Sun, 24 Dec 2017 17:55:14 +0800 -Subject: [PATCH] build: Fix non-wayland builds - -meta_dnd_wayland_handle_end_modal is not available on non-wayland build. - -https://bugzilla.gnome.org/show_bug.cgi?id=791916 ---- - src/compositor/compositor.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c -index 51d22bc17..aa49347c9 100644 ---- a/src/compositor/compositor.c -+++ b/src/compositor/compositor.c -@@ -419,11 +419,13 @@ meta_end_modal_for_plugin (MetaCompositor *compositor, - meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_POINTER_ID, timestamp); - meta_backend_ungrab_device (backend, META_VIRTUAL_CORE_KEYBOARD_ID, timestamp); - -+#ifdef HAVE_WAYLAND - if (meta_is_wayland_compositor ()) - { - meta_dnd_wayland_handle_end_modal (compositor); - meta_display_sync_wayland_input_focus (display); - } -+#endif - } - - static void --- -2.18.0 - diff --git a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch b/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch deleted file mode 100644 index 41c3e94d8602..000000000000 --- a/x11-wm/mutter/files/3.32.2-no-cogl-gles2.patch +++ /dev/null @@ -1,81 +0,0 @@ -From a00bd286724b3186c17d70f1b2fe98da2d90bf60 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Sun, 1 Sep 2019 14:42:04 +0300 -Subject: [PATCH] build: Allow building native backend without cogl-gles2 - -Native backend already requires gles2, but was controlled by gles2 -meson option, even though it's hard required with native_backend -already, and errored out if gles2 wasn't enabled too. -Instead allow native_backend to be built without cogl-gles2 by simply -checking for the gles2 hard requirement in case of have_native_backend -too and not erroring out without -Dgles2=true, which is now used only -for controlling cogl-gles2 build. ---- - meson.build | 10 +++------- - src/meson.build | 4 ++-- - 2 files changed, 5 insertions(+), 9 deletions(-) - -diff --git a/meson.build b/meson.build -index 6160a4bb3..c85284ba2 100644 ---- a/meson.build -+++ b/meson.build -@@ -150,12 +150,13 @@ endif - have_egl_xlib = have_egl and have_x11 - - have_gles2 = get_option('gles2') --if have_gles2 -+have_native_backend = get_option('native_backend') -+if have_gles2 or have_native_backend - gles2_dep = dependency('glesv2') - gles2_libname = get_option('gles2_libname') - - if not have_egl -- error('GLESv2 support requires EGL to be enabled') -+ error('GLESv2 and native backend support requires EGL to be enabled') - endif - endif - -@@ -177,7 +178,6 @@ if have_libgudev - gudev_dep = dependency('gudev-1.0', version: gudev_req) - endif - --have_native_backend = get_option('native_backend') - if have_native_backend - libdrm_dep = dependency('libdrm') - libgbm_dep = dependency('gbm', version: gbm_req) -@@ -194,10 +194,6 @@ if have_native_backend - error('The native backend requires EGL to be enabled') - endif - -- if not have_gles2 -- error('The native backend requires GLESv2 to be enabled') -- endif -- - if not have_libgudev - error('The native backend requires udev to be enabled') - endif -diff --git a/src/meson.build b/src/meson.build -index 182f7f5f5..af9776480 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -36,7 +36,7 @@ if have_gl - ] - endif - --if have_gles2 -+if have_native_backend - mutter_pkg_private_deps += [ - gles2_dep, - ] -@@ -436,7 +436,7 @@ if have_egl - ] - endif - --if have_gles2 -+if have_native_backend - mutter_sources += [ - 'backends/meta-gles3.c', - 'backends/meta-gles3.h', --- -2.20.1 - |