X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=subprojects%2Fgst-omx%2Fmeson.build;h=3952a0e8a45e0759b06c99998170871b17cd5ffb;hb=3e29ac35c4d6be56893969af19d8e21137160814;hp=d37fc7bd772b4324e2ef1ef1d8d669dd2f05b7be;hpb=a7f54159b724d4966686c84a1f93688ef157e3f2;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build
index d37fc7b..3952a0e 100644
--- a/subprojects/gst-omx/meson.build
+++ b/subprojects/gst-omx/meson.build
@@ -1,6 +1,6 @@
 project('gst-omx', 'c',
-  version : '1.19.2',
-  meson_version : '>= 0.54',
+  version : '1.21.2',
+  meson_version : '>= 0.62',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -15,7 +15,7 @@ else
   gst_version_nano = 0
 endif
 
-glib_req = '>= 2.56.0'
+glib_req = '>= 2.62.0'
 gst_req = '>= @0@.@1@.0'.format(gst_version_major, gst_version_minor)
 tizil_req = '>= 0.19.0'
 api_version = '1.0'
@@ -49,6 +49,12 @@ else
   noseh_link_args = []
 endif
 
+# glib doesn't support unloading, which means that unloading and reloading
+# any library that registers static types will fail
+if cc.has_link_argument('-Wl,-z,nodelete')
+  add_project_link_arguments('-Wl,-z,nodelete', language: 'c')
+endif
+
 cdata = configuration_data()
 check_headers = [
 #  ['HAVE_DLFCN_H', 'dlfcn.h'],
@@ -163,9 +169,7 @@ gstcheck_dep = dependency('gstreamer-check-1.0', version : gst_req,
     fallback : ['gstreamer', 'gst_check_dep'])
 
 libm = cc.find_library('m', required : false)
-glib_dep = dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep'])
-gio_dep = dependency('gio-2.0', version : glib_req, fallback: ['glib', 'libgio_dep'] )
-gmodule_dep = dependency('gmodule-2.0', version : glib_req, fallback: ['glib', 'libgmodule_dep'])
+gmodule_dep = dependency('gmodule-no-export-2.0', version: glib_req)
 
 gst_omx_args = ['-DHAVE_CONFIG_H']
 configinc = include_directories('.')
@@ -188,8 +192,8 @@ elif omx_target == 'rpi'
 
   if gstgl_dep.found()
     if gstgl_dep.type_name() == 'pkgconfig'
-      gl_winsys = gstgl_dep.get_pkgconfig_variable('gl_winsys').split(' ')
-      gl_platforms = gstgl_dep.get_pkgconfig_variable('gl_platforms').split(' ')
+      gl_winsys = gstgl_dep.get_variable('gl_winsys').split(' ')
+      gl_platforms = gstgl_dep.get_variable('gl_platforms').split(' ')
     elif gstgl_dep.type_name() == 'internal'
       # XXX assume gst-plugins-base was built with dispmanx and egl support
       gl_winsys = ['dispmanx']
@@ -219,8 +223,8 @@ elif omx_target == 'tizonia'
   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')
+  cdata.set('TIZONIA_LIBDIR', tizil_dep.get_variable('libdir'))
+  tizil_includedir = tizil_dep.get_variable('includedir')
   gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
   omx_inc = []
 else
@@ -288,7 +292,7 @@ endif
 have_omx_vp8 = cc.has_header_symbol(
     'OMX_Video.h',
     'OMX_VIDEO_CodingVP8',
-    prefix : extra_video_headers, 
+    prefix : extra_video_headers,
     args : gst_omx_args,
     include_directories : [omx_inc])
 if have_omx_vp8
@@ -348,7 +352,6 @@ warning_flags = [
 
 warning_c_flags = [
   '-Wmissing-prototypes',
-  '-Wdeclaration-after-statement',
   '-Wold-style-definition',
   '-Waggregate-return',
 ]
@@ -415,18 +418,10 @@ subdir('docs')
 # Set release date
 if gst_version_nano == 0
   extract_release_date = find_program('scripts/extract-release-date-from-doap-file.py')
-  run_result = run_command(extract_release_date, gst_version, files('gst-omx.doap'))
-  if run_result.returncode() == 0
-    release_date = run_result.stdout().strip()
-    cdata.set_quoted('GST_PACKAGE_RELEASE_DATETIME', release_date)
-    message('Package release date: ' + release_date)
-  else
-    # Error out if our release can't be found in the .doap file
-    error(run_result.stderr())
-  endif
+  run_result = run_command(extract_release_date, gst_version, files('gst-omx.doap'), check: true)
+  release_date = run_result.stdout().strip()
+  cdata.set_quoted('GST_PACKAGE_RELEASE_DATETIME', release_date)
+  message('Package release date: ' + release_date)
 endif
 
 configure_file(output: 'config.h', configuration: cdata)
-
-python3 = find_program('python3')
-run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')