raspbian

Gbp-Pq: Name raspbian.diff

diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h
index 4bfac07fae03cc3bdf3cb46fa0c1be0da74e2271..2d695c3289622c57b867ef362d43e96f149e423f 100644 (file)
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@@ -39,7 +39,7 @@
 #include <cogl/cogl-error-private.h>
 #include <cogl/cogl-frame-info-private.h>
 #include <cogl/cogl-renderer-private.h>
-#include <cogl/winsys/cogl-winsys-egl-private.h>
+//#include <cogl/winsys/cogl-winsys-egl-private.h>
 #include <cogl/winsys/cogl-winsys-private.h>
 
 void cogl_renderer_set_custom_winsys (CoglRenderer          *renderer,

diff --git a/src/backends/meta-barrier.c b/src/backends/meta-barrier.c
index a1e1180feb6bc29b1f232ce18f33b6663c4be316..e98881f8684e1110696da50f55365a9a9c53dc57 100644 (file)
--- a/src/backends/meta-barrier.c
+++ b/src/backends/meta-barrier.c
@@ -12,8 +12,8 @@
 
 #include <meta/util.h>
 #include <meta/barrier.h>
-#include "backends/native/meta-backend-native.h"
-#include "backends/native/meta-barrier-native.h"
+//#include "backends/native/meta-backend-native.h"
+//#include "backends/native/meta-barrier-native.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-barrier-x11.h"
 #include <meta/meta-enum-types.h>

diff --git a/src/backends/x11/meta-renderer-x11.c b/src/backends/x11/meta-renderer-x11.c
index c0405bedcf46dfdb12e008d567e4fc175ed7a7d6..ec1bb2215e21bbed424d824e446a2ab212edcb14 100644 (file)
--- a/src/backends/x11/meta-renderer-x11.c
+++ b/src/backends/x11/meta-renderer-x11.c
@@ -49,9 +49,9 @@ G_DEFINE_TYPE (MetaRendererX11, meta_renderer_x11, META_TYPE_RENDERER)
 static const CoglWinsysVtable *
 get_x11_cogl_winsys_vtable (void)
 {
-  if (meta_is_wayland_compositor ())
-    return _cogl_winsys_egl_xlib_get_vtable ();
-  else
+  //if (meta_is_wayland_compositor ())
+    //return _cogl_winsys_egl_xlib_get_vtable ();
+  //else
     return _cogl_winsys_glx_get_vtable ();
 }
 

diff --git a/src/core/display.c b/src/core/display.c
index 42a530f6c65d66b9acf2ba87b60c12ffcb02ad49..1b28a3d8ff36fadcaffe03521f5f68506e310a58 100644 (file)
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -50,7 +50,7 @@
 #include "meta-idle-monitor-dbus.h"
 #include "meta-cursor-tracker-private.h"
 #include <meta/meta-backend.h>
-#include "backends/native/meta-backend-native.h"
+//#include "backends/native/meta-backend-native.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/meta-stage.h"
 #include "backends/meta-input-settings-private.h"