gl/build: add configure check for possibly missing EGLAttrib

Fixes the build on older android targets.
This commit is contained in:
Matthew Waters 2016-08-16 16:51:02 +10:00
parent 4e04f28478
commit 2b6841da32
2 changed files with 18 additions and 0 deletions

View file

@ -1384,6 +1384,7 @@ GST_GL_HAVE_GLINTPTR=0
GST_GL_HAVE_GLSYNC=0 GST_GL_HAVE_GLSYNC=0
GST_GL_HAVE_GLUINT64=0 GST_GL_HAVE_GLUINT64=0
GST_GL_HAVE_GLINT64=0 GST_GL_HAVE_GLINT64=0
GST_GL_HAVE_EGLATTRIB=0
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
CFLAGS="$GL_CFLAGS $CFLAGS" CFLAGS="$GL_CFLAGS $CFLAGS"
@ -1423,6 +1424,17 @@ if test "x$ac_cv_type_GLint64" = "xyes"; then
GST_GL_HAVE_GLINT64=1 GST_GL_HAVE_GLINT64=1
fi fi
if test "x$USE_EGL" = "xyes"; then
EGL_INCLUDES="$GL_INCLUDES
#include <EGL/egl.h>
#include <EGL/eglext.h>
"
AC_CHECK_TYPES(EGLAttrib, [], [], [[$EGL_INCLUDES]])
if test "x$ac_cv_type_EGLAttrib" = "xyes"; then
GST_GL_HAVE_EGLATTRIB=1
fi
fi
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
@ -1433,6 +1445,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
#define GST_GL_HAVE_GLSYNC $GST_GL_HAVE_GLSYNC #define GST_GL_HAVE_GLSYNC $GST_GL_HAVE_GLSYNC
#define GST_GL_HAVE_GLUINT64 $GST_GL_HAVE_GLUINT64 #define GST_GL_HAVE_GLUINT64 $GST_GL_HAVE_GLUINT64
#define GST_GL_HAVE_GLINT64 $GST_GL_HAVE_GLINT64 #define GST_GL_HAVE_GLINT64 $GST_GL_HAVE_GLINT64
#define GST_GL_HAVE_EGLATTRIB $GST_GL_HAVE_EGLATTRIB
" "
AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [ AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [

View file

@ -46,4 +46,9 @@
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
/* compatibility definitions... */
#if !GST_GL_HAVE_EGLATTRIB
typedef EGLAttrib gintptr;
#endif
#endif /* _GST_EGL_H_ */ #endif /* _GST_EGL_H_ */