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

meson: fix tizonia build

Browse source 
meson.build was both using path to gst-omx/openmax/OMX*
headers and path to OMX headers provided by tizilheaders.pc
so this patch makes sure we only use the later.

Also bump tizonia minimum version to 0.19.0 which
is the latest release.
This commit is contained in:
Julien Isorce 2019-12-20 22:19:06 -08:00
parent 5f212c159b
commit 871625c950
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -17,7 +17,7 @@ endif
glib_req = '>= 2.44.0' glib_req = '>= 2.44.0'
gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor) gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
tizil_req = '>= 0.1.0' tizil_req = '>= 0.19.0'
api_version = '1.0' api_version = '1.0'
plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir')) plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
@ -207,11 +207,15 @@ elif omx_target == 'zynqultrascaleplus'
error ('Need Allegro OMX headers to build for Zynq UltraScale+. Use -Dheader_path option to specify the path of those headers.') error ('Need Allegro OMX headers to build for Zynq UltraScale+. Use -Dheader_path option to specify the path of those headers.')
endif endif
elif omx_target == 'tizonia' elif omx_target == 'tizonia'
if omx_header_path != ''
warning('Ignoring -Dheader_path because path is in tizilheaders.pc')
endif
cdata.set('USE_OMX_TARGET_TIZONIA', 1) cdata.set('USE_OMX_TARGET_TIZONIA', 1)
tizil_dep = dependency('tizilheaders', version : tizil_req) tizil_dep = dependency('tizilheaders', version : tizil_req)
cdata.set('TIZONIA_LIBDIR', tizil_dep.get_pkgconfig_variable('libdir')) cdata.set('TIZONIA_LIBDIR', tizil_dep.get_pkgconfig_variable('libdir'))
tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir') tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir')
gst_omx_args += ['-I' + tizil_includedir + '/tizonia'] gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
omx_inc = []
else else
error ('Unsupported omx target specified. Use the -Dtarget option') error ('Unsupported omx target specified. Use the -Dtarget option')
endif endif