mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-07 16:05:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: gl: fix 'invalid keyword argument' meson warnings

Browse source 
Required is not a valid kwarg for cc.has_header()
This commit is contained in:
Tim-Philipp Müller 2018-04-20 11:42:16 +01:00
parent 0978a2efa9
commit 8ab2f96b63
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/gl/meson.build
View file

@ -103,7 +103,7 @@ if build_gstgl and gstgl_dep.found()
optional_deps += bcm_host_dep optional_deps += bcm_host_dep
endif endif
if egl_dep.found() and cc.has_header('libdrm/drm_fourcc.h', required : false) if egl_dep.found() and cc.has_header('libdrm/drm_fourcc.h')
optional_deps += allocators_dep optional_deps += allocators_dep
endif endif

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

@ -283,7 +283,7 @@ if need_api_opengl != 'no' or need_platform_glx != 'no'
gl_dep = cc.find_library('GL', required : false) gl_dep = cc.find_library('GL', required : false)
endif endif
if not cc.has_header('GL/gl.h', required : false) if not cc.has_header('GL/gl.h')
gl_dep = unneeded_dep gl_dep = unneeded_dep
endif endif
@ -334,7 +334,7 @@ if need_api_gles2 != 'no'
gles2_dep = cc.find_library('GLESv2', required : false) gles2_dep = cc.find_library('GLESv2', required : false)
# endif # endif
if not cc.has_header('GLES2/gl2.h', required : false) if not cc.has_header('GLES2/gl2.h')
gles2_dep = unneeded_dep gles2_dep = unneeded_dep
endif endif
@ -343,7 +343,7 @@ if need_api_gles2 != 'no'
endif endif
endif endif
gles3_h = gles2_dep.found() and cc.has_header('GLES3/gl3.h', required : false, dependencies : gles2_dep) gles3_h = gles2_dep.found() and cc.has_header('GLES3/gl3.h', dependencies : gles2_dep)
gles_includes = ''' gles_includes = '''
#ifdef HAVE_IOS /* FIXME */ #ifdef HAVE_IOS /* FIXME */
@ -351,7 +351,7 @@ if need_api_gles2 != 'no'
# include <OpenGLES/ES2/glext.h> # include <OpenGLES/ES2/glext.h>
#else''' #else'''
if gles3_h if gles3_h
gles3ext3_h = gles3_h and cc.has_header('GLES3/gl3ext.h', required : false, dependencies : gles2_dep) gles3ext3_h = gles3_h and cc.has_header('GLES3/gl3ext.h', dependencies : gles2_dep)
gles_includes += ''' gles_includes += '''
# include <GLES3/gl3.h> # include <GLES3/gl3.h>
# include <GLES2/gl2ext.h>''' # include <GLES2/gl2ext.h>'''
@ -440,7 +440,7 @@ if need_platform_egl != 'no'
gl_platform_deps += egl_dep gl_platform_deps += egl_dep
glconf.set10('GST_GL_HAVE_PLATFORM_EGL', 1) glconf.set10('GST_GL_HAVE_PLATFORM_EGL', 1)
if cc.has_header('libdrm/drm_fourcc.h', required : false) if cc.has_header('libdrm/drm_fourcc.h')
gl_misc_deps += allocators_dep gl_misc_deps += allocators_dep
glconf.set10('GST_GL_HAVE_DMABUF', 1) glconf.set10('GST_GL_HAVE_DMABUF', 1)
endif endif