diff options
| author | Julien Isorce <jisorce@oblong.com> | 2019-12-20 22:19:06 -0800 |
|---|---|---|
| committer | Julien Isorce <jisorce@oblong.com> | 2019-12-22 21:50:43 -0800 |
| commit | 871625c950f3f20f5f410c9f707f2a3311587365 (patch) | |
| tree | 11b7d29fcc8179f67d6d8a7bda6cb2f527283c39 | |
| parent | 5f212c159be57dc02ffed0caeca965ec53ba0e8e (diff) | |
| download | gst-omx-871625c950f3f20f5f410c9f707f2a3311587365.tar.gz | |
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.
| -rw-r--r-- | meson.build | 6 |
1 files changed, 5 insertions, 1 deletions
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 |