mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Include GL_CFLAGS while checking for GL typedefs

Browse source 
Otherwise those checks may fail at configure time if they contain extra
include paths, while at build time they are included, potentially causing
incompatible typedefs between system GL headers and gstreamer compatibility
prototypes.

https://bugzilla.gnome.org/show_bug.cgi?id=733248
This commit is contained in:
Mart Raudsepp 2014-07-16 16:31:27 +03:00 committed by Sebastian Dröge
parent 0bb6d22ffc
commit 96aa931635
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -1327,6 +1327,9 @@ GST_GL_HAVE_GLCHAR=0
GST_GL_HAVE_GLSIZEIPTR=0 GST_GL_HAVE_GLSIZEIPTR=0
GST_GL_HAVE_GLINTPTR=0 GST_GL_HAVE_GLINTPTR=0
old_CFLAGS=$CFLAGS
CFLAGS="$GL_CFLAGS $CFLAGS"
AC_CHECK_TYPES(GLeglImageOES, [], [], [[$GL_INCLUDES]]) AC_CHECK_TYPES(GLeglImageOES, [], [], [[$GL_INCLUDES]])
if test "x$ac_cv_type_GLeglImageOES" = "xyes"; then if test "x$ac_cv_type_GLeglImageOES" = "xyes"; then
GST_GL_HAVE_GLEGLIMAGEOES=1 GST_GL_HAVE_GLEGLIMAGEOES=1
@ -1347,6 +1350,8 @@ if test "x$ac_cv_type_GLintptr" = "xyes"; then
GST_GL_HAVE_GLINTPTR=1 GST_GL_HAVE_GLINTPTR=1
fi fi
CFLAGS=$old_CFLAGS
GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
#define GST_GL_HAVE_GLEGLIMAGEOES $GST_GL_HAVE_GLEGLIMAGEOES #define GST_GL_HAVE_GLEGLIMAGEOES $GST_GL_HAVE_GLEGLIMAGEOES
#define GST_GL_HAVE_GLCHAR $GST_GL_HAVE_GLCHAR #define GST_GL_HAVE_GLCHAR $GST_GL_HAVE_GLCHAR