protection: Release decryptors list, even if it's empty

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

diff --git a/meson.build b/meson.build
index 77f5d70..74300ec 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('gstreamer', 'c',
-  version : '1.13.90',
-  meson_version : '>= 0.40.1',
+  version : '1.15.0.1',
+  meson_version : '>= 0.46',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -24,7 +24,7 @@ soversion = 0
 libversion = '@0@.@1@.0'.format(soversion, gst_version_minor * 100 + gst_version_micro)
 
 prefix = get_option('prefix')
-libtype = get_option('library_format')
+libtype = get_option('default_library')
 
 libexecdir = get_option('libexecdir')
 helpers_install_dir = join_paths(libexecdir, 'gstreamer-1.0')
@@ -42,7 +42,7 @@ if cc.get_id() == 'msvc'
       '/wd4244', # lossy type conversion (e.g. double -> int)
       '/wd4305', # truncating type conversion (e.g. double -> float)
       language : 'c')
-elif cc.has_argument('-Wl,-Bsymbolic-functions')
+elif cc.has_link_argument('-Wl,-Bsymbolic-functions')
   # FIXME: Add an option for this if people ask for it
   add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c')
 endif
@@ -77,6 +77,7 @@ cdata.set_quoted('PLUGINDIR', join_paths(get_option('prefix'), get_option('libdi
 cdata.set_quoted('VERSION', gst_version)
 # FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option
 cdata.set('MEMORY_ALIGNMENT_MALLOC', 1)
+cdata.set('ENABLE_NLS', get_option('nls'))
 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_SCANNER_SUBDIR', libexecdir,
@@ -94,7 +95,7 @@ else
 endif
 
 # 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 source release'
@@ -105,7 +106,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'))
 
 # These are only needed/used by the ABI tests
 host_defines = [
@@ -220,7 +221,7 @@ posix_timers_src = time_prefix + '''
 #error Either _POSIX_TIMERS or CLOCK_REALTIME not defined
 #endif
 '''
-if cc.compiles(posix_timers_src, prefix : time_prefix, name : 'posix timers from time.h')
+if cc.compiles(posix_timers_src, name : 'posix timers from time.h')
   cdata.set('HAVE_POSIX_TIMERS', 1)
 endif
 
@@ -229,7 +230,7 @@ monotonic_clock_src = time_prefix + '''
 #error Either _POSIX_MONOTONIC_CLOCK or CLOCK_MONOTONIC not defined
 #endif
 '''
-if cc.compiles(monotonic_clock_src, prefix : time_prefix, name : 'monotonic clock from time.h')
+if cc.compiles(monotonic_clock_src, name : 'monotonic clock from time.h')
   cdata.set('HAVE_MONOTONIC_CLOCK', 1)
 endif
 
@@ -301,7 +302,7 @@ if host_machine.system() == 'windows'
 endif
 
 backtrace_deps = []
-if not get_option('disable_libunwind')
+if get_option('libunwind')
   unwind_dep = dependency('libunwind', required : false)
   dw_dep = dependency('libdw', required: false)
   backtrace_deps = [unwind_dep, dw_dep]
@@ -333,8 +334,8 @@ if cc.has_header('execinfo.h')
   endif
 endif
 
-disable_gst_debug = get_option('disable_gst_debug')
-if disable_gst_debug
+gst_debug = get_option('gst_debug')
+if not gst_debug
   add_project_arguments(['-Wno-unused'], language: 'c')
 endif
 
@@ -376,7 +377,7 @@ test_deps = [gmp_dep, gsl_dep, gslcblas_dep]
 # Used by gstinfo.c
 dl_dep = cc.find_library('dl', required : false)
 cdata.set('HAVE_DLADDR', cc.has_function('dladdr', dependencies : dl_dep))
-
+cdata.set10('GST_ENABLE_EXTRA_CHECKS', get_option('extra-checks'))
 
 configinc = include_directories('.')
 libsinc = include_directories('libs')
@@ -408,7 +409,7 @@ gir = find_program('g-ir-scanner', required : false)
 gnome = import('gnome')
 
 # Fixme, not very elegant.
-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_DISABLE", "yes", TRUE);' + \
@@ -417,10 +418,11 @@ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' +
     'g_setenv("GST_PLUGIN_SYSTEM_PATH_1_0", "", TRUE);' + \
     'gst_init(NULL,NULL);' ]
 
-# Used by the *_mkenum.py helper scripts
-glib_mkenums = find_program('glib-mkenums')
-
 gst_c_args = ['-DHAVE_CONFIG_H']
+
+# FIXME: This is only needed on windows and probably breaks when
+# libtype=='both'. We should add this flag to static_c_args instead when Meson
+# supports it: https://github.com/mesonbuild/meson/issues/3304
 if libtype == 'static'
   gst_c_args += ['-DGST_STATIC_COMPILATION']
 endif
@@ -472,7 +474,7 @@ subdir('tests')
 subdir('data')
 
 # xgettext is optional (on Windows for instance)
-if find_program('xgettext', required : false).found()
+if get_option('nls') and find_program('xgettext', required : false).found()
   subdir('po')
 endif
 
@@ -480,7 +482,7 @@ configure_file(output : 'config.h', configuration : cdata)
 
 if build_machine.system() == 'windows'
   message('Disabling gtk-doc while building on Windows')
-elif get_option('disable_gtkdoc')
+elif not get_option('gtk_doc')
   message('gtk-doc is disabled via options')
 else
   if find_program('gtkdoc-scan', required : false).found()