From 70dc3ecbd6986b0f9ded6ec9c7d4634dda5c5465 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri, 27 Aug 2010 16:19:00 +0100
Subject: [PATCH] egl: Fix the installed headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 • Use the public COGL_HAS_GLES[12] define instead of the HAVE_COGL_*
   ones which are private and defined in config.h,
 • Install clutter-egl-headers.h which is needed by clutter-egl.h,
 • Remove clutter-stage.h as it's uneeded and does not work since the
   single clutter.h include policy,
 • Install the egl headers into their own egl directory as the x11 and
   glx backends do. The include should then be <clutter/egl/clutter-egl.h>,
   so document it. It does not really break anything as nobody could
   have used those broken headers.
---
 clutter/egl/Makefile.am           |  4 ++--
 clutter/egl/clutter-egl-headers.h | 12 +++++++-----
 clutter/egl/clutter-egl.h         |  6 ++++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/clutter/egl/Makefile.am b/clutter/egl/Makefile.am
index 0559cc9ca..1bc681a50 100644
--- a/clutter/egl/Makefile.am
+++ b/clutter/egl/Makefile.am
@@ -1,5 +1,5 @@
-libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter
-libclutterinclude_HEADERS = clutter-egl.h
+libclutterincludedir = $(includedir)/clutter-@CLUTTER_API_VERSION@/clutter/egl
+libclutterinclude_HEADERS = clutter-egl.h clutter-egl-headers.h
 
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"ClutterEGL\" \
diff --git a/clutter/egl/clutter-egl-headers.h b/clutter/egl/clutter-egl-headers.h
index d0fc84c61..f2d89e12f 100644
--- a/clutter/egl/clutter-egl-headers.h
+++ b/clutter/egl/clutter-egl-headers.h
@@ -22,17 +22,19 @@
 #ifndef __CLUTTER_EGL_HEADERS_H__
 #define __CLUTTER_EGL_HEADERS_H__
 
-#ifdef HAVE_COGL_GLES2
+#include <cogl/cogl.h>
+
+#ifdef COGL_HAS_GLES2
 #include <GLES2/gl2.h>
 #include <EGL/egl.h>
-#else /* HAVE_COGL_GLES2 */
+#else /* COGL_HAS_GLES2 */
 #include <GLES/gl.h>
 #include <GLES/egl.h>
-#endif /* HAVE_COGL_GLES2 */
+#endif /* COGL_HAS_GLES2 */
 
-#ifdef HAVE_COGL_GLES2
+#ifdef COGL_HAS_GLES2
 #define NativeDisplayType EGLNativeDisplayType
 #define NativeWindowType EGLNativeWindowType
-#endif /* HAVE_COGL_GLES2 */
+#endif /* COGL_HAS_GLES2 */
 
 #endif /* __CLUTTER_EGL_HEADERS_H__ */
diff --git a/clutter/egl/clutter-egl.h b/clutter/egl/clutter-egl.h
index f8495d3e7..223e64004 100644
--- a/clutter/egl/clutter-egl.h
+++ b/clutter/egl/clutter-egl.h
@@ -28,6 +28,10 @@
  * @short_description: EGL specific API
  *
  * The EGL backend for Clutter provides some EGL specific API
+ *
+ * You need to include
+ * <filename class="headerfile">&lt;clutter/egl/clutter-egl.h&gt;</filename>
+ * to have access to the functions documented here.
  */
 
 #ifndef __CLUTTER_EGL_H__
@@ -43,8 +47,6 @@
 
 #include "clutter-egl-headers.h"
 
-#include <clutter/clutter-stage.h>
-
 G_BEGIN_DECLS
 
 #ifdef COGL_HAS_XLIB_SUPPORT