tee: Check for the removed pad flag also in the slow pushing path

[platform/upstream/gstreamer.git] / meson.build

diff --git a/meson.build b/meson.build
index 739d942..b55ecc5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gstreamer', 'c',
-  version : '1.15.0.1',
+  version : '1.16.1',
   meson_version : '>= 0.47',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -114,6 +114,8 @@ cdata.set_quoted('PLUGINDIR', join_paths(get_option('prefix'), get_option('libdi
 cdata.set_quoted('VERSION', gst_version)
 cdata.set_quoted('GST_PLUGIN_SCANNER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-plugin-scanner'))
 cdata.set_quoted('GST_PTP_HELPER_INSTALLED', join_paths(prefix, helpers_install_dir, 'gst-ptp-helper'))
+cdata.set_quoted('GST_PLUGIN_SUBDIR', get_option('libdir'),
+  description: 'plugin directory path component, used to find plugins on relocatable builds on windows')
 cdata.set_quoted('GST_PLUGIN_SCANNER_SUBDIR', libexecdir,
   description: 'libexecdir path component, used to find plugin-scanner on relocatable builds on windows')
 cdata.set('GST_DISABLE_OPTION_PARSING', not get_option('option-parsing'))
@@ -347,8 +349,9 @@ endif
 
 backtrace_deps = []
 unwind_dep = dependency('libunwind', required : get_option('libunwind'))
-dw_dep = dependency('libdw', required: get_option('libunwind'))
-backtrace_deps = [unwind_dep, dw_dep]
+dw_dep = dependency('libdw', required: get_option('libdw'))
+dbghelp_dep = dependency('DbgHelp', required : get_option('dbghelp'))
+backtrace_deps = [unwind_dep, dw_dep, dbghelp_dep]
 if unwind_dep.found()
   cdata.set('HAVE_UNWIND', 1)
   if dw_dep.found()
@@ -356,12 +359,12 @@ if unwind_dep.found()
   else
     message('Support for backtraces is partial only.')
   endif
+elif cc.has_function('backtrace')
+  cdata.set('HAVE_BACKTRACE', 1)
+elif dbghelp_dep.found()
+  cdata.set('HAVE_DBGHELP', 1)
 else
-  if cc.has_function('backtrace')
-    cdata.set('HAVE_BACKTRACE', 1)
-  else
-      message('NO backtraces support.')
-  endif
+  message('NO backtraces support.')
 endif
 
 if cc.has_header('execinfo.h')
@@ -396,7 +399,6 @@ warning_flags = [
   '-Waddress',
   '-Waggregate-return',
   '-Wno-multichar',
-  '-Wnested-externs',
   '-Wdeclaration-after-statement',
   '-Wvla',
   '-Wpointer-arith',
@@ -427,7 +429,7 @@ libsinc = include_directories('libs')
 privinc = include_directories('gst')
 
 # Find dependencies
-glib_dep = dependency('glib-2.0', version : '>=2.32.0',
+glib_dep = dependency('glib-2.0', version : '>=2.40.0',
   fallback: ['glib', 'libglib_dep'])
 gobject_dep = dependency('gobject-2.0',
   fallback: ['glib', 'libgobject_dep'])
@@ -458,7 +460,7 @@ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' +
     'g_setenv("GST_REGISTRY_1.0", "/no/way/this/exists.reg", TRUE);' + \
     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
     'g_setenv("GST_PLUGIN_SYSTEM_PATH_1_0", "", TRUE);' + \
-    'gst_init(NULL,NULL);' ]
+    'gst_init(NULL,NULL);', '--quiet']
 
 gst_c_args = ['-DHAVE_CONFIG_H']