meson: Add tizonia option

https://bugzilla.gnome.org/show_bug.cgi?id=782800

diff --git a/config/meson.build b/config/meson.build
index 1dcabe9..9e5d144 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -4,4 +4,6 @@ elif omx_target == 'bellagio'
   subdir ('bellagio')
 elif omx_target == 'zynqultrascaleplus'
   subdir ('zynqultrascaleplus')
+elif omx_target == 'tizonia'
+  subdir ('tizonia')
 endif

diff --git a/config/tizonia/meson.build b/config/tizonia/meson.build
index dc99c08..abc6e94 100644 (file)
--- a/config/tizonia/meson.build
+++ b/config/tizonia/meson.build
@@ -1 +1,6 @@
-install_data (['gstomx.conf'], install_dir : omx_conf_dir)
+infile = 'gstomx.conf.in'
+outfile = 'gstomx.conf'
+configure_file(input : infile,
+               output : outfile,
+               configuration : cdata,
+               install_dir : omx_conf_dir)

diff --git a/meson.build b/meson.build
index 042bf60..ae618b2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -17,7 +17,7 @@ endif
 
 glib_req = '>= 2.40.0'
 gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
-
+tizil_req = '>= 0.1.0'
 api_version = '1.0'
 soversion = 0
 # maintaining compatibility with the previous libtool versioning
@@ -235,6 +235,12 @@ elif omx_target == 'bellagio'
   cdata.set('USE_OMX_TARGET_BELLAGIO', 1)
 elif omx_target == 'zynqultrascaleplus'
   cdata.set('USE_OMX_TARGET_ZYNQ_USCALE_PLUS', 1)
+elif omx_target == 'tizonia'
+  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')
+  add_global_arguments('-I' + tizil_includedir + '/tizonia', language : 'C')
 else
   error ('Unsupported omx target specified. Use the -Dwith_omx_target option')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 5270645..a5a0c40 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
 option('with_omx_header_path', type : 'string', value : '', description : 'An extra include directory to find the OpenMax headers')
-option('with_omx_target', type : 'combo', choices : ['none', 'generic', 'rpi', 'bellagio', 'zynqultrascaleplus'], value : 'none', description : 'The OMX platform to target')
+option('with_omx_target', type : 'combo', choices : ['none', 'generic', 'rpi', 'bellagio', 'tizonia', 'zynqultrascaleplus'], value : 'none', description : 'The OMX platform to target')
 option('with_omx_struct_packing', type : 'combo', choices : ['0', '1', '2', '4', '8'], value : '0', description : 'Force OpenMAX struct packing')