X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=subprojects%2Fgst-omx%2Fmeson.build;h=1d98633e47822f5e76a43aed6e3f206e9ed4e81c;hb=bf6ce1d64a0697e7910826147b48f8f658366a5a;hp=bd791060fcd38e077ef8e142e7f9d53415b57a98;hpb=f0b045a69bb0b36515b84e3b64df9dc30c8f1e1a;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/subprojects/gst-omx/meson.build b/subprojects/gst-omx/meson.build
index bd79106..1d98633 100644
--- a/subprojects/gst-omx/meson.build
+++ b/subprojects/gst-omx/meson.build
@@ -1,6 +1,6 @@
 project('gst-omx', 'c',
-  version : '1.20.0',
-  meson_version : '>= 0.59',
+  version : '1.22.5',
+  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('.')
@@ -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',
 ]
@@ -422,3 +425,5 @@ if gst_version_nano == 0
 endif
 
 configure_file(output: 'config.h', configuration: cdata)
+
+meson.add_dist_script('scripts/gen-changelog.py', meson.project_name(), '1.20.0', meson.project_version())