From 90d041ed1b64e6c9982fe5277d3db594992cf4c4 Mon Sep 17 00:00:00 2001
From: Bart van Strien <bart.bes+projects@gmail.com>
Date: Fri, 27 Dec 2013 16:50:07 +0100
Subject: [PATCH] Patch GLee for missing GLXContextID typedef after upstream
 (mesa) removal from header

---
 src/modules/graphics/opengl/GLee.c | 4 ++--
 src/modules/graphics/opengl/GLee.h | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
index c2910e46e..01f6279d9 100644
--- a/src/modules/graphics/opengl/GLee.c
+++ b/src/modules/graphics/opengl/GLee.c
@@ -15423,12 +15423,12 @@ int __GLeeGLXNumExtensions=53;
 #endif
 #ifndef GLEE_C_DEFINED_glXGetContextIDEXT
 #define GLEE_C_DEFINED_glXGetContextIDEXT
-  GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext  context)  {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLXContextID)0;}
+  GLEE_GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext  context)  {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLEE_GLXContextID)0;}
   GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT=GLee_Lazy_glXGetContextIDEXT;
 #endif
 #ifndef GLEE_C_DEFINED_glXImportContextEXT
 #define GLEE_C_DEFINED_glXImportContextEXT
-  GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLXContextID  contextID)  {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
+  GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLEE_GLXContextID  contextID)  {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
   GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT=GLee_Lazy_glXImportContextEXT;
 #endif
 #ifndef GLEE_C_DEFINED_glXFreeContextEXT
diff --git a/src/modules/graphics/opengl/GLee.h b/src/modules/graphics/opengl/GLee.h
index 45322b9e5..35c101a6a 100644
--- a/src/modules/graphics/opengl/GLee.h
+++ b/src/modules/graphics/opengl/GLee.h
@@ -65,6 +65,8 @@
 	#define GLX_GLXEXT_PROTOTYPES
 	#include <GL/gl.h>
 	#include <GL/glx.h>
+
+	typedef XID GLEE_GLXContextID;
 #endif
 
 #ifndef APIENTRY
@@ -23683,13 +23685,13 @@ GLEE_EXTERN GLboolean _GLEE_GLX_NV_video_output;
 #endif
 #ifndef GLEE_H_DEFINED_glXGetContextIDEXT
 #define GLEE_H_DEFINED_glXGetContextIDEXT
-  typedef GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext  context);
+  typedef GLEE_GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext  context);
   GLEE_EXTERN GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT;
   #define glXGetContextIDEXT GLeeFuncPtr_glXGetContextIDEXT
 #endif
 #ifndef GLEE_H_DEFINED_glXImportContextEXT
 #define GLEE_H_DEFINED_glXImportContextEXT
-  typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLXContextID  contextID);
+  typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLEE_GLXContextID  contextID);
   GLEE_EXTERN GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT;
   #define glXImportContextEXT GLeeFuncPtr_glXImportContextEXT
 #endif