From 2cef205925f426b902ccbbfc361648f7674af762 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Sat, 21 Jan 2012 09:22:01 +0000
Subject: [PATCH] Comp: Fix building without wayland clients.

SVN revision: 67424
---
 src/modules/comp/Makefile.am          | 10 ++++++----
 src/modules/comp/e_mod_comp_wayland.c | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/modules/comp/Makefile.am b/src/modules/comp/Makefile.am
index f570d5a84..66d99b973 100644
--- a/src/modules/comp/Makefile.am
+++ b/src/modules/comp/Makefile.am
@@ -30,10 +30,12 @@ module_la_SOURCES      = e_mod_main.c \
                          e_mod_comp_update.c \
                          e_mod_comp_update.h \
                          e_mod_comp_cfdata.c \
-                         e_mod_comp_cfdata.h \
-                         e_mod_comp_wayland.h \
-                         e_mod_comp_wayland.c
-                         
+                         e_mod_comp_cfdata.h
+if HAVE_WAYLAND
+module_la_SOURCES += e_mod_comp_wayland.h \
+                     e_mod_comp_wayland.c
+endif
+
 module_la_LIBADD       = @e_libs@ @dlopen_libs@ @WAYLAND_LIBS@
 module_la_LDFLAGS      = -module -avoid-version
 module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/src/modules/comp/e_mod_comp_wayland.c b/src/modules/comp/e_mod_comp_wayland.c
index 1d84d2e75..fc1d0815f 100644
--- a/src/modules/comp/e_mod_comp_wayland.c
+++ b/src/modules/comp/e_mod_comp_wayland.c
@@ -15,6 +15,7 @@ typedef struct _Wayland_Shell Wayland_Shell;
 typedef struct _Wayland_Surface Wayland_Surface;
 typedef struct _Wayland_Shell_Surface Wayland_Shell_Surface;
 typedef struct _Wayland_Frame_Callback Wayland_Frame_Callback;
+typedef struct _Wayland_Shader Wayland_Shader;
 
 enum _Wayland_Shell_Surface_Type
 {
@@ -120,6 +121,16 @@ struct _Wayland_Frame_Callback
    struct wl_list link;
 };
 
+struct _Wayland_Shader
+{
+   GLuint program;
+   GLuint vertex, fragment;
+   struct 
+     {
+        GLuint proj, tex, alpha, color;
+     } uniform;
+};
+
 struct wl_shell
 {
    Wayland_Shell shell;