Drop an unused patch
This commit is contained in:
parent
0b15163068
commit
dfdf832e3a
@ -1,52 +0,0 @@
|
||||
From 51607fb27a595004c765036f6070f55cda08487c Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 14 Mar 2013 12:31:52 +0100
|
||||
Subject: [PATCH] clutter: Prefer the X11 backend to the Wayland one
|
||||
|
||||
If clutter is built with both X11 and Wayland support, prefer the
|
||||
(more complete for now) X11 backend. This matches GTK+'s current
|
||||
ordering.
|
||||
|
||||
This allows distributions to ship a clutter version with both backends
|
||||
built, and using an envvar to switch to the wayland backend and test
|
||||
applications.
|
||||
|
||||
In the future, applications would be able to choose which backend
|
||||
they prefer and in which order.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=695838
|
||||
---
|
||||
clutter/clutter-main.c | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
|
||||
index da7fe83..d08b97d 100644
|
||||
--- a/clutter/clutter-main.c
|
||||
+++ b/clutter/clutter-main.c
|
||||
@@ -1386,6 +1386,11 @@ clutter_create_backend (void)
|
||||
retval = g_object_new (CLUTTER_TYPE_BACKEND_WIN32, NULL);
|
||||
else
|
||||
#endif
|
||||
+#ifdef CLUTTER_WINDOWING_X11
|
||||
+ if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
|
||||
+ retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
|
||||
+ else
|
||||
+#endif
|
||||
#ifdef CLUTTER_WINDOWING_WAYLAND
|
||||
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_WAYLAND))
|
||||
retval = g_object_new (CLUTTER_TYPE_BACKEND_WAYLAND, NULL);
|
||||
@@ -1396,11 +1401,6 @@ clutter_create_backend (void)
|
||||
retval = g_object_new (CLUTTER_TYPE_BACKEND_EGL_NATIVE, NULL);
|
||||
else
|
||||
#endif
|
||||
-#ifdef CLUTTER_WINDOWING_X11
|
||||
- if (backend == NULL || backend == I_(CLUTTER_WINDOWING_X11))
|
||||
- retval = g_object_new (CLUTTER_TYPE_BACKEND_X11, NULL);
|
||||
- else
|
||||
-#endif
|
||||
#ifdef CLUTTER_WINDOWING_GDK
|
||||
if (backend == NULL || backend == I_(CLUTTER_WINDOWING_GDK))
|
||||
retval = g_object_new (CLUTTER_TYPE_BACKEND_GDK, NULL);
|
||||
--
|
||||
1.8.1.4
|
||||
|
Loading…
Reference in New Issue
Block a user