isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

configure: Don't conditionalize gbm

Browse Source 
Let's just say it's required for now.
This commit is contained in:
Jasper St. Pierre 2014-08-27 12:04:13 -04:00
parent b091cbf361
commit 4c08d9a53b
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -79,6 +79,7 @@ MUTTER_PC_MODULES="
$CLUTTER_PACKAGE >= 1.19.5 $CLUTTER_PACKAGE >= 1.19.5
clutter-egl-1.0 clutter-egl-1.0
cogl-1.0 >= 1.17.1 cogl-1.0 >= 1.17.1
gbm
upower-glib >= 0.99.0 upower-glib >= 0.99.0
gnome-desktop-3.0 gnome-desktop-3.0
xcomposite >= 0.2 xcomposite >= 0.2

6
src/backends/meta-cursor-private.h
View File

@ -25,15 +25,11 @@
#include "meta-cursor.h" #include "meta-cursor.h"
#include <cogl/cogl.h> #include <cogl/cogl.h>
#ifdef HAVE_NATIVE_BACKEND
#include <gbm.h> #include <gbm.h>
#endif
typedef struct { typedef struct {
CoglTexture2D *texture; CoglTexture2D *texture;
#ifdef HAVE_NATIVE_BACKEND
struct gbm_bo *bo; struct gbm_bo *bo;
#endif
int hot_x, hot_y; int hot_x, hot_y;
} MetaCursorImage; } MetaCursorImage;
@ -48,10 +44,8 @@ CoglTexture *meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor
int *hot_x, int *hot_x,
int *hot_y); int *hot_y);
#ifdef HAVE_NATIVE_BACKEND
struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, struct gbm_bo *meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
int *hot_x, int *hot_x,
int *hot_y); int *hot_y);
#endif
#endif /* META_CURSOR_PRIVATE_H */ #endif /* META_CURSOR_PRIVATE_H */

2
src/backends/meta-cursor-renderer.h
View File

@ -30,6 +30,8 @@
#include <meta/screen.h> #include <meta/screen.h>
#include "meta-cursor.h" #include "meta-cursor.h"
#include <gbm.h>
#define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ()) #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(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)) #define META_CURSOR_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_CURSOR_RENDERER, MetaCursorRendererClass))

2
src/backends/meta-cursor.c
View File

@ -362,7 +362,6 @@ meta_cursor_reference_get_cogl_texture (MetaCursorReference *cursor,
return COGL_TEXTURE (cursor->image.texture); return COGL_TEXTURE (cursor->image.texture);
} }
#ifdef HAVE_NATIVE_BACKEND
struct gbm_bo * struct gbm_bo *
meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor, meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
int *hot_x, int *hot_x,
@ -374,7 +373,6 @@ meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
*hot_y = cursor->image.hot_y; *hot_y = cursor->image.hot_y;
return cursor->image.bo; return cursor->image.bo;
} }
#endif
MetaCursor MetaCursor
meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor) meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)