diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-08-27 12:04:13 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-08-27 12:05:00 -0400 |
| commit | 4c08d9a53b17fc4c9527cce083014041fe754666 (patch) | |
| tree | 6df143441d8db2bfd2ca6f0b86148367d79616e1 | |
| parent | b091cbf361fbf19d23a287178a9044c038ad90af (diff) | |
| download | mutter-4c08d9a53b17fc4c9527cce083014041fe754666.tar.gz | |
configure: Don't conditionalize gbm
Let's just say it's required for now.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/backends/meta-cursor-private.h | 6 | ||||
| -rw-r--r-- | src/backends/meta-cursor-renderer.h | 2 | ||||
| -rw-r--r-- | src/backends/meta-cursor.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index e613bb83a..d7f66d8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ MUTTER_PC_MODULES=" $CLUTTER_PACKAGE >= 1.19.5 clutter-egl-1.0 cogl-1.0 >= 1.17.1 + gbm upower-glib >= 0.99.0 gnome-desktop-3.0 xcomposite >= 0.2 diff --git a/src/backends/meta-cursor-private.h b/src/backends/meta-cursor-private.h index 338718f42..09ab9928d 100644 --- a/src/backends/meta-cursor-private.h +++ b/src/backends/meta-cursor-private.h @@ -25,15 +25,11 @@ #include "meta-cursor.h" #include <cogl/cogl.h> -#ifdef HAVE_NATIVE_BACKEND #include <gbm.h> -#endif typedef struct { CoglTexture2D *texture; -#ifdef HAVE_NATIVE_BACKEND struct gbm_bo *bo; -#endif int hot_x, hot_y; } MetaCursorImage; @@ -48,10 +44,8 @@ CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor int *hot_x, int *hot_y); -#ifdef HAVE_NATIVE_BACKEND struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, int *hot_x, int *hot_y); -#endif #endif /* META_CURSOR_PRIVATE_H */ diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h index ae60d9176..b2afe3b02 100644 --- a/src/backends/meta-cursor-renderer.h +++ b/src/backends/meta-cursor-renderer.h @@ -30,6 +30,8 @@ #include <meta/screen.h> #include "meta-cursor.h" +#include <gbm.h> + #define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ()) #define META_CURSOR_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER, MetaCursorRenderer)) #define META_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass)) diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c index 84a1828c5..592e26f32 100644 --- a/src/backends/meta-cursor.c +++ b/src/backends/meta-cursor.c @@ -362,7 +362,6 @@ meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor, return COGL_TEXTURE (cursor->image.texture); } -#ifdef HAVE_NATIVE_BACKEND struct gbm_bo * meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, int *hot_x, @@ -374,7 +373,6 @@ meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, *hot_y = cursor->image.hot_y; return cursor->image.bo; } -#endif MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor) |