X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=subprojects%2Fgst-plugins-good%2Fmeson.build;h=c80dc929511342a7c29294c90dea3b026c53c21f;hb=064711d8b382c106afffe75cefbabe8f7bac8532;hp=97e0b97b792c89b5320bdb2297e77df1e3806610;hpb=9d9e59622f0531781a76e1d8ac96471cb14c6677;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build
index 97e0b97..c80dc92 100644
--- a/subprojects/gst-plugins-good/meson.build
+++ b/subprojects/gst-plugins-good/meson.build
@@ -1,6 +1,6 @@
 project('gst-plugins-good', 'c',
-  version : '1.21.0.1',
-  meson_version : '>= 0.60',
+  version : '1.22.4',
+  meson_version : '>= 0.62',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -18,6 +18,9 @@ gst_version_is_stable = gst_version_minor.is_even()
 gst_version_is_dev = gst_version_minor.is_odd() and gst_version_micro < 90
 
 have_cxx = add_languages('cpp', native: false, required: false)
+if have_cxx
+  cxx = meson.get_compiler('cpp')
+endif
 
 glib_req = '>= 2.62.0'
 orc_req = '>= 0.4.17'
@@ -32,6 +35,7 @@ api_version = '1.0'
 
 plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
 plugins = []
+static_build = get_option('default_library') == 'static'
 
 cc = meson.get_compiler('c')
 host_system = host_machine.system()
@@ -83,6 +87,18 @@ endif
 if cc.has_link_argument('-Wl,-Bsymbolic-functions')
   add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c')
 endif
+if have_cxx and cxx.has_link_argument('-Wl,-Bsymbolic-functions')
+  add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'cpp')
+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
+if have_cxx and cxx.has_link_argument('-Wl,-z,nodelete')
+  add_project_link_arguments('-Wl,-z,nodelete', language: 'cpp')
+endif
 
 # Symbol visibility
 if cc.has_argument('-fvisibility=hidden')
@@ -229,15 +245,10 @@ warning_flags = [
 
 warning_c_flags = [
   '-Wmissing-prototypes',
-  '-Wdeclaration-after-statement',
   '-Wold-style-definition',
   '-Waggregate-return',
 ]
 
-if have_cxx
-  cxx = meson.get_compiler('cpp')
-endif
-
 foreach extra_arg : warning_flags
   if cc.has_argument (extra_arg)
     add_project_arguments([extra_arg], language: 'c')
@@ -509,8 +520,18 @@ 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())
+
 plugin_names = []
+gst_plugins = []
 foreach plugin: plugins
+  # gstsoup is a special case because of the way we build the static/dynamic libraries
+  if plugin.name() not in ['gstsoup', 'gstadaptivedemux2']
+    pkgconfig.generate(plugin, install_dir: plugins_pkgconfig_install_dir)
+  endif
+  dep = declare_dependency(link_with: plugin, variables: {'full_path': plugin.full_path()})
+  meson.override_dependency(plugin.name(), dep)
+  gst_plugins += [dep]
   if plugin.name().startswith('gst')
     plugin_names += [plugin.name().substring(3)]
   else