From 2b6841da3201dfc91bf6c88a064d651ee081f9fa Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 16 Aug 2016 16:51:02 +1000 Subject: [PATCH] gl/build: add configure check for possibly missing EGLAttrib Fixes the build on older android targets. --- configure.ac | 13 +++++++++++++ gst-libs/gst/gl/egl/gstegl.h | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/configure.ac b/configure.ac index 01c22be535..c5b7645fd9 100644 --- a/configure.ac +++ b/configure.ac @@ -1384,6 +1384,7 @@ GST_GL_HAVE_GLINTPTR=0 GST_GL_HAVE_GLSYNC=0 GST_GL_HAVE_GLUINT64=0 GST_GL_HAVE_GLINT64=0 +GST_GL_HAVE_EGLATTRIB=0 old_CFLAGS=$CFLAGS CFLAGS="$GL_CFLAGS $CFLAGS" @@ -1423,6 +1424,17 @@ if test "x$ac_cv_type_GLint64" = "xyes"; then GST_GL_HAVE_GLINT64=1 fi +if test "x$USE_EGL" = "xyes"; then + EGL_INCLUDES="$GL_INCLUDES + #include + #include + " + 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 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_GLUINT64 $GST_GL_HAVE_GLUINT64 #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], [ diff --git a/gst-libs/gst/gl/egl/gstegl.h b/gst-libs/gst/gl/egl/gstegl.h index 82d4953dde..d227153cd7 100644 --- a/gst-libs/gst/gl/egl/gstegl.h +++ b/gst-libs/gst/gl/egl/gstegl.h @@ -46,4 +46,9 @@ #pragma GCC diagnostic pop #endif +/* compatibility definitions... */ +#if !GST_GL_HAVE_EGLATTRIB +typedef EGLAttrib gintptr; +#endif + #endif /* _GST_EGL_H_ */