From 871625c950f3f20f5f410c9f707f2a3311587365 Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Fri, 20 Dec 2019 22:19:06 -0800 Subject: meson: fix tizonia build 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. --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index dbc9680..714996a 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,7 @@ endif glib_req = '>= 2.44.0' 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' 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.') endif 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) tizil_dep = dependency('tizilheaders', version : tizil_req) cdata.set('TIZONIA_LIBDIR', tizil_dep.get_pkgconfig_variable('libdir')) tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir') gst_omx_args += ['-I' + tizil_includedir + '/tizonia'] + omx_inc = [] else error ('Unsupported omx target specified. Use the -Dtarget option') endif -- cgit v1.2.1