From e5e875ded86a59469ac6eebb45a9cbb6f36f4c20 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Thu, 19 May 2016 10:17:52 -0500 Subject: [PATCH] Fix dmabuf breakage of non wayland builds. #IWearTheHatOfShame --- src/bin/e_pixmap.c | 4 ++++ src/bin/e_pixmap.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c index f45da3747..febb689ec 100644 --- a/src/bin/e_pixmap.c +++ b/src/bin/e_pixmap.c @@ -684,10 +684,12 @@ e_pixmap_is_pixels(E_Pixmap *cp) { case E_PIXMAP_TYPE_X: return EINA_FALSE; +#ifdef HAVE_WAYLAND case E_PIXMAP_TYPE_WL: if (!cp->buffer) return EINA_TRUE; if (cp->buffer->shm_buffer) return EINA_TRUE; return EINA_FALSE; +#endif default: return EINA_TRUE; } @@ -1043,6 +1045,7 @@ e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...) va_end(l); } +#ifdef HAVE_WAYLAND E_API Eina_Bool e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf) { @@ -1064,3 +1067,4 @@ e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *dmabuf) return EINA_TRUE; } +#endif diff --git a/src/bin/e_pixmap.h b/src/bin/e_pixmap.h index 1a6fb026d..ed04078f7 100644 --- a/src/bin/e_pixmap.h +++ b/src/bin/e_pixmap.h @@ -53,7 +53,9 @@ E_API void e_pixmap_image_opaque_get(E_Pixmap *cp, int *x, int *y, int *w, int * E_API void e_pixmap_alias(E_Pixmap *cp, E_Pixmap_Type type, ...); +#ifdef HAVE_WAYLAND E_API Eina_Bool e_pixmap_dmabuf_test(struct linux_dmabuf_buffer *); +#endif static inline Eina_Bool e_pixmap_is_x(const E_Pixmap *cp)