Release 1.19.2

[platform/upstream/gst-plugins-base.git] / meson.build

diff --git a/meson.build b/meson.build
index 01690ff..9b00253 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gst-plugins-base', 'c',
-  version : '1.19.0.1',
+  version : '1.19.2',
   meson_version : '>= 0.54',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
@@ -44,17 +44,23 @@ plugins = []
 cc = meson.get_compiler('c')
 
 if cc.get_id() == 'msvc'
-  # Ignore several spurious warnings for things gstreamer does very commonly
-  # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
-  # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once
-  # NOTE: Only add warnings here if you are sure they're spurious
-  add_project_arguments(
+  msvc_args = [
+      # Ignore several spurious warnings for things gstreamer does very commonly
+      # If a warning is completely useless and spammy, use '/wdXXXX' to suppress it
+      # If a warning is harmless but hard to fix, use '/woXXXX' so it's shown once
+      # NOTE: Only add warnings here if you are sure they're spurious
       '/wd4018', # implicit signed/unsigned conversion
       '/wd4146', # unary minus on unsigned (beware INT_MIN)
       '/wd4244', # lossy type conversion (e.g. double -> int)
       '/wd4305', # truncating type conversion (e.g. double -> float)
       cc.get_supported_arguments(['/utf-8']), # set the input encoding to utf-8
-      language : 'c')
+
+      # Enable some warnings on MSVC to match GCC/Clang behaviour
+      '/w14062', # enumerator 'identifier' in switch of enum 'enumeration' is not handled
+      '/w14101', # 'identifier' : unreferenced local variable
+      '/w14189', # 'identifier' : local variable is initialized but not referenced
+  ]
+  add_project_arguments(msvc_args, language: ['c', 'cpp'])
   # Disable SAFESEH with MSVC for plugins and libs that use external deps that
   # are built with MinGW
   noseh_link_args = ['/SAFESEH:NO']
@@ -441,6 +447,8 @@ pkgconfig_variables = ['exec_prefix=${prefix}',
     'libexecdir=${prefix}/libexec']
 pkgconfig_subdirs = ['gstreamer-1.0']
 
+meson_pkg_config_file_fixup_script = find_program('scripts/meson-pkg-config-file-fixup.py')
+
 python3 = import('python').find_installation()
 subdir('gst-libs')
 subdir('gst')
@@ -463,16 +471,25 @@ base_libraries = ['allocators', 'app', 'audio', 'fft', 'pbutils', 'riff', 'rtp',
 if build_gstgl
   base_libraries += 'gl'
 endif
+
+pkgconfig_plugins_base_libs_variables = [
+  'libraries=' + ' '.join(base_libraries),
+]
+
 pkgconfig.generate(
   libraries : [gst_dep],
-  variables : pkgconfig_variables + [
-    'libraries=' + ' '.join(base_libraries),
-  ],
+  variables : pkgconfig_variables + pkgconfig_plugins_base_libs_variables,
+  uninstalled_variables : pkgconfig_plugins_base_libs_variables,
   subdirs : pkgconfig_subdirs,
   name : 'gstreamer-plugins-base-1.0',
   description : 'Streaming media framework, base plugins libraries',
 )
 
+# Desperate times, desperate measures... fix up escaping of our variables
+run_command(meson_pkg_config_file_fixup_script,
+  'gstreamer-plugins-base-1.0', 'libraries',
+  check: true)
+
 if have_orcc
   update_orc_dist_files = find_program('scripts/update-orc-dist-files.py')
 
@@ -510,6 +527,10 @@ if gst_version_nano == 0
   endif
 endif
 
+if gio_dep.version().version_compare('< 2.67.4')
+  core_conf.set('g_memdup2(ptr,sz)', '(G_LIKELY(((guint64)(sz)) < G_MAXUINT)) ? g_memdup(ptr,sz) : (g_abort(),NULL)')
+endif
+
 # Use core_conf after all subdirs have set values
 configure_file(output : 'config.h', configuration : core_conf)