From: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Date: Fri, 21 Oct 2016 23:24:13 +0000 (+0000)
Subject: raspbian
X-Git-Tag: archive/raspbian/3.22.2-3+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f5e96de27af74731bd230449b21ae69a2267f3f1;p=mutter.git

raspbian


Gbp-Pq: Name raspbian.diff
---

diff --git a/cogl/cogl/cogl-mutter.h b/cogl/cogl/cogl-mutter.h
index 4bfac07..2d695c3 100644
--- 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 a1e1180..e98881f 100644
--- 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 c0405be..ec1bb22 100644
--- 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 42a530f..1b28a3d 100644
--- 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"