mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-01 17:31:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/build: fixed failed compilation due to missing EGLuint64KHR typedef

Browse source 
[Matthew Waters]: add meson differences

https://bugzilla.gnome.org/show_bug.cgi?id=796820
This commit is contained in:
Iñigo Huguet 2018-07-16 16:01:34 +02:00 committed by Matthew Waters
parent ae5120a489
commit 48a0178857
4 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gst-libs/gst/gl/egl/gsteglimage.c
View file

@ -86,7 +86,7 @@
#define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274 #define EGL_DMA_BUF_PLANE0_PITCH_EXT 0x3274
#endif #endif
#ifdef USE_EGL_RPI #if !GST_GL_HAVE_EGLUINT64KHR
typedef khronos_uint64_t EGLuint64KHR; typedef khronos_uint64_t EGLuint64KHR;
#endif #endif

1
gst-libs/gst/gl/gstglconfig.h.meson
View file

@ -43,6 +43,7 @@ G_BEGIN_DECLS
#mesondefine GST_GL_HAVE_GLUINT64 #mesondefine GST_GL_HAVE_GLUINT64
#mesondefine GST_GL_HAVE_GLINT64 #mesondefine GST_GL_HAVE_GLINT64
#mesondefine GST_GL_HAVE_EGLATTRIB #mesondefine GST_GL_HAVE_EGLATTRIB
#mesondefine GST_GL_HAVE_EGLUINT64KHR
G_END_DECLS G_END_DECLS

4
gst-libs/gst/gl/meson.build
View file

@ -122,6 +122,7 @@ glconf_options = [
'GST_GL_HAVE_GLUINT64', 'GST_GL_HAVE_GLUINT64',
'GST_GL_HAVE_GLINT64', 'GST_GL_HAVE_GLINT64',
'GST_GL_HAVE_EGLATTRIB', 'GST_GL_HAVE_EGLATTRIB',
'GST_GL_HAVE_EGLUINT64KHR',
] ]
foreach option : glconf_options foreach option : glconf_options
@ -716,6 +717,9 @@ if build_gstgl
if egl_dep.found() and cc.has_type('EGLAttrib', prefix : gl_include_block + egl_includes, dependencies : gl_lib_deps + [egl_dep], include_directories : gl_includes) if egl_dep.found() and cc.has_type('EGLAttrib', prefix : gl_include_block + egl_includes, dependencies : gl_lib_deps + [egl_dep], include_directories : gl_includes)
glconf.set('GST_GL_HAVE_EGLATTRIB', 1) glconf.set('GST_GL_HAVE_EGLATTRIB', 1)
endif endif
if egl_dep.found() and cc.has_type('EGLuint64KHR', prefix : gl_include_block + egl_includes, dependencies : gl_lib_deps + [egl_dep], include_directories : gl_includes)
glconf.set('GST_GL_HAVE_EGLUINT64KHR', 1)
endif
message('Building libgstgl with GL api: ' + ' '.join(enabled_gl_apis)) message('Building libgstgl with GL api: ' + ' '.join(enabled_gl_apis))
message('Building libgstgl with GL platform: ' + ' '.join(enabled_gl_platforms)) message('Building libgstgl with GL platform: ' + ' '.join(enabled_gl_platforms))

7
m4/gst-gl.m4
View file

@ -897,6 +897,7 @@ 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 GST_GL_HAVE_EGLATTRIB=0
GST_GL_HAVE_EGLUINT64KHR=0
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
CFLAGS="$GL_CFLAGS $CFLAGS" CFLAGS="$GL_CFLAGS $CFLAGS"
@ -945,6 +946,11 @@ if test "x$USE_EGL" = "xyes"; then
if test "x$ac_cv_type_EGLAttrib" = "xyes"; then if test "x$ac_cv_type_EGLAttrib" = "xyes"; then
GST_GL_HAVE_EGLATTRIB=1 GST_GL_HAVE_EGLATTRIB=1
fi fi
AC_CHECK_TYPES(EGLuint64KHR, [], [], [[$EGL_INCLUDES]])
if test "x$ac_cv_type_EGLuint64KHR" = "xyes"; then
GST_GL_HAVE_EGLUINT64KHR=1
fi
fi fi
CFLAGS=$old_CFLAGS CFLAGS=$old_CFLAGS
@ -958,6 +964,7 @@ GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
#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 #define GST_GL_HAVE_EGLATTRIB $GST_GL_HAVE_EGLATTRIB
#define GST_GL_HAVE_EGLUINT64KHR $GST_GL_HAVE_EGLUINT64KHR
" "
AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [ AC_CONFIG_COMMANDS([gst-libs/gst/gl/gstglconfig.h], [