X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=meson.build;h=228b25659367135caa353dbdd0a40699717807ed;hb=768fb5695c91ef1fb95ea056da0a5eace21168e6;hp=200c7a8871db51668571d9b80152a3cf9ce2dbea;hpb=e6e64c95c6381d5fd893ffa18181cf79d49d99ea;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/meson.build b/meson.build
index 200c7a8..228b256 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gst-rtsp-server', 'c',
-  version : '1.13.90',
-  meson_version : '>= 0.33.0',
+  version : '1.15.0.1',
+  meson_version : '>= 0.46.0',
   default_options : ['warning_level=1', 'buildtype=debugoptimized'])
 
 gst_version = meson.project_version()
@@ -27,6 +27,10 @@ plugins_install_dir = '@0@/gstreamer-1.0'.format(get_option('libdir'))
 
 cc = meson.get_compiler('c')
 
+if cc.has_link_argument('-Wl,-Bsymbolic-functions')
+  add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c')
+endif
+
 # Symbol visibility
 if cc.has_argument('-fvisibility=hidden')
   add_project_arguments('-fvisibility=hidden', language: 'c')
@@ -50,7 +54,7 @@ cdata.set_quoted('GST_LICENSE', 'LGPL')
 # cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 
 # GStreamer package name and origin url
-gst_package_name = get_option('with-package-name')
+gst_package_name = get_option('package-name')
 if gst_package_name == ''
   if gst_version_nano == 0
     gst_package_name = 'GStreamer RTSP Server Library source release'
@@ -61,7 +65,7 @@ if gst_package_name == ''
   endif
 endif
 cdata.set_quoted('GST_PACKAGE_NAME', gst_package_name)
-cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('with-package-origin'))
+cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
 
 configure_file(output : 'config.h', configuration : cdata)
 
@@ -113,7 +117,7 @@ gstnet_dep = dependency('gstreamer-net-1.0', version : gst_req,
 
 gir = find_program('g-ir-scanner', required : false)
 gnome = import('gnome')
-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection')
+build_gir = gir.found() and not meson.is_cross_build() and get_option('introspection')
 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \