From e653ae9fc26ef98d625c0204ace36cf15e9f2f5c Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Fri, 28 Nov 2014 13:04:21 +1100
Subject: [PATCH] gl: fixup compat definition for GLuint64 for OS X

---
 configure.ac                                | 7 +++++++
 gst-libs/gst/gl/glprototypes/gstgl_compat.h | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b4d45bd301..26de8578ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1272,6 +1272,7 @@ GST_GL_HAVE_GLCHAR=0
 GST_GL_HAVE_GLSIZEIPTR=0
 GST_GL_HAVE_GLINTPTR=0
 GST_GL_HAVE_GLSYNC=0
+GST_GL_HAVE_GLUINT64=0
 
 old_CFLAGS=$CFLAGS
 CFLAGS="$GL_CFLAGS $CFLAGS"
@@ -1301,6 +1302,11 @@ if test "x$ac_cv_type_GLsync" = "xyes"; then
   GST_GL_HAVE_GLSYNC=1
 fi
 
+AC_CHECK_TYPES(GLuint64, [], [], [[$GL_INCLUDES]])
+if test "x$ac_cv_type_GLuint64" = "xyes"; then
+  GST_GL_HAVE_GLUINT64=1
+fi
+
 CFLAGS=$old_CFLAGS
 
 GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
@@ -1309,6 +1315,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
 #define GST_GL_HAVE_GLSIZEIPTR $GST_GL_HAVE_GLSIZEIPTR
 #define GST_GL_HAVE_GLINTPTR $GST_GL_HAVE_GLINTPTR
 #define GST_GL_HAVE_GLSYNC $GST_GL_HAVE_GLSYNC
+#define GST_GL_HAVE_GLUINT64 $GST_GL_HAVE_GLUINT64
 "
 
 AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [
diff --git a/gst-libs/gst/gl/glprototypes/gstgl_compat.h b/gst-libs/gst/gl/glprototypes/gstgl_compat.h
index 00d6944a66..a4f963d8df 100644
--- a/gst-libs/gst/gl/glprototypes/gstgl_compat.h
+++ b/gst-libs/gst/gl/glprototypes/gstgl_compat.h
@@ -39,7 +39,7 @@ typedef ptrdiff_t GLintptr;
 #if !GST_GL_HAVE_GLSYNC
 typedef gpointer GLsync;
 #endif
-#ifndef GLuint64
+#if !GST_GL_HAVE_GLUINT64
 typedef guint64 GLuint64;
 #endif
 
-- 
2.34.1