gstpad: Fix non-serialized sticky event push

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

diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build
index 416fbdd..56d9709 100644 (file)
--- a/subprojects/gstreamer/meson.build
+++ b/subprojects/gstreamer/meson.build
@@ -1,6 +1,6 @@
 project('gstreamer', 'c',
-  version : '1.21.0.1',
-  meson_version : '>= 0.60',
+  version : '1.21.1.1',
+  meson_version : '>= 0.62',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -74,6 +74,12 @@ elif cc.has_link_argument('-Wl,-Bsymbolic-functions')
   add_project_link_arguments('-Wl,-Bsymbolic-functions', language : 'c')
 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
+
 # Symbol visibility
 have_visibility_hidden = false
 if cc.get_id() == 'msvc'
@@ -603,15 +609,14 @@ if get_option('default_library') == 'shared'
   # If we don't build static plugins there is no need to generate pc files
   plugins_pkgconfig_install_dir = disabler()
 endif
-pkgconfig_variables = ['exec_prefix=${prefix}',
-    'toolsdir=${exec_prefix}/bin',
-    'pluginsdir=${libdir}/gstreamer-1.0',
-    'datarootdir=${prefix}/share',
-    'datadir=${datarootdir}',
-    'girdir=${datadir}/gir-1.0',
-    'typelibdir=${libdir}/girepository-1.0',
-    'libexecdir=${prefix}/libexec',
-    'pluginscannerdir=${libexecdir}/gstreamer-1.0']
+pkgconfig_variables = [
+  'exec_prefix=${prefix}',
+  'toolsdir=${exec_prefix}/bin',
+  'pluginsdir=${libdir}/gstreamer-1.0',
+  'girdir=${datadir}/gir-1.0',
+  'typelibdir=${libdir}/girepository-1.0',
+  'pluginscannerdir=${libexecdir}/gstreamer-1.0'
+]
 pkgconfig_uninstalled_variables = ['exec_prefix=${prefix}',
        'gstreamerdir=${prefix}/subprojects/gstreamer',
     'bashhelpersdir=${gstreamerdir}/data/bash-completion/helpers',
@@ -623,7 +628,7 @@ if host_system == 'darwin'
 endif
 
 static_build = get_option('default_library') == 'static'
-libraries = []
+gst_libraries = []
 subdir('gst')
 subdir('libs')
 subdir('plugins')
@@ -655,6 +660,7 @@ install_data('gst-element-check-1.0.m4', install_dir : join_paths(get_option('da
 plugin_names = []
 gst_plugins = []
 foreach plugin: plugins
+  pkgconfig.generate(plugin, install_dir: plugins_pkgconfig_install_dir)
   dep = declare_dependency(link_with: plugin, variables: {'full_path': plugin.full_path()})
   meson.override_dependency(plugin.name(), dep)
   gst_plugins += [dep]