mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: fix miscellaneous meson warnings

Browse source 
cc.has_header*() doesn't have a 'required:' kwarg.
This commit is contained in:
Tim-Philipp Müller 2018-04-20 11:54:14 +01:00
parent e1a149f3d5
commit cbb28c5702
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
meson.build
View file

@ -203,8 +203,7 @@ elif omx_target == 'zynqultrascaleplus'
have_allegro_header = cc.has_header ( have_allegro_header = cc.has_header (
'OMX_Allegro.h', 'OMX_Allegro.h',
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
if not have_allegro_header if not have_allegro_header
error ('Need Allegro OMX headers to build for Zynq UltraScale+. Use with_omx_header_path option to specify the path of those headers.') error ('Need Allegro OMX headers to build for Zynq UltraScale+. Use with_omx_header_path option to specify the path of those headers.')
endif endif
@ -224,8 +223,7 @@ extra_video_headers = ''
if cc.has_header ( if cc.has_header (
'OMX_VideoExt.h', 'OMX_VideoExt.h',
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
extra_video_headers += ''' extra_video_headers += '''
#include <OMX_VideoExt.h>''' #include <OMX_VideoExt.h>'''
cdata.set ('HAVE_VIDEO_EXT', 1) cdata.set ('HAVE_VIDEO_EXT', 1)
@ -234,51 +232,44 @@ endif
if cc.has_header ( if cc.has_header (
'OMX_IndexExt.h', 'OMX_IndexExt.h',
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
cdata.set ('HAVE_INDEX_EXT', 1) cdata.set ('HAVE_INDEX_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_ComponentExt.h', 'OMX_ComponentExt.h',
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
cdata.set ('HAVE_COMPONENT_EXT', 1) cdata.set ('HAVE_COMPONENT_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_CoreExt.h', 'OMX_CoreExt.h',
args : gst_omx_args, args : gst_omx_args)
required : false)
cdata.set ('HAVE_CORE_EXT', 1) cdata.set ('HAVE_CORE_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_AudioExt.h', 'OMX_AudioExt.h',
args : gst_omx_args, args : gst_omx_args)
required : false)
cdata.set ('HAVE_AUDIO_EXT', 1) cdata.set ('HAVE_AUDIO_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_IVCommonExt.h', 'OMX_IVCommonExt.h',
args : gst_omx_args, args : gst_omx_args)
required : false)
cdata.set ('HAVE_IV_COMMON_EXT', 1) cdata.set ('HAVE_IV_COMMON_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_ImageExt.h', 'OMX_ImageExt.h',
args : gst_omx_args, args : gst_omx_args)
required : false)
cdata.set ('HAVE_IMAGE_EXT', 1) cdata.set ('HAVE_IMAGE_EXT', 1)
endif endif
if cc.has_header ( if cc.has_header (
'OMX_OtherExt.h', 'OMX_OtherExt.h',
args : gst_omx_args, args : gst_omx_args)
required : false)
cdata.set ('HAVE_OTHER_EXT', 1) cdata.set ('HAVE_OTHER_EXT', 1)
endif endif
@ -287,8 +278,7 @@ have_omx_vp8 = cc.has_header_symbol(
'OMX_VIDEO_CodingVP8', 'OMX_VIDEO_CodingVP8',
prefix : extra_video_headers, prefix : extra_video_headers,
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
if have_omx_vp8 if have_omx_vp8
cdata.set('HAVE_VP8', 1) cdata.set('HAVE_VP8', 1)
endif endif
@ -298,8 +288,7 @@ have_omx_theora = cc.has_header_symbol(
'OMX_VIDEO_CodingTheora', 'OMX_VIDEO_CodingTheora',
prefix : extra_video_headers, prefix : extra_video_headers,
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
if have_omx_theora if have_omx_theora
cdata.set('HAVE_THEORA', 1) cdata.set('HAVE_THEORA', 1)
endif endif
@ -309,8 +298,7 @@ have_omx_hevc = cc.has_header_symbol(
'OMX_VIDEO_CodingHEVC', 'OMX_VIDEO_CodingHEVC',
prefix : extra_video_headers, prefix : extra_video_headers,
args : gst_omx_args, args : gst_omx_args,
include_directories : [omx_inc], include_directories : [omx_inc])
required : false)
if have_omx_hevc if have_omx_hevc
cdata.set('HAVE_HEVC', 1) cdata.set('HAVE_HEVC', 1)
endif endif