Bump GLib requirement to >= 2.62

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

diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build
index cea8dff..d776e77 100644 (file)
--- a/subprojects/gst-plugins-base/meson.build
+++ b/subprojects/gst-plugins-base/meson.build
@@ -1,6 +1,6 @@
 project('gst-plugins-base', 'c',
   version : '1.21.0.1',
-  meson_version : '>= 0.59',
+  meson_version : '>= 0.60',
   default_options : [ 'warning_level=1',
                       'buildtype=debugoptimized' ])
 
@@ -27,7 +27,7 @@ else
   have_objc = false
 endif
 
-glib_req = '>= 2.56.0'
+glib_req = '>= 2.62.0'
 orc_req = '>= 0.4.24'
 
 if gst_version_is_stable
@@ -96,6 +96,7 @@ if cc.has_link_argument('-Wl,-Bsymbolic-functions')
 endif
 
 core_conf = configuration_data()
+core_conf.set('ENABLE_NLS', 1)
 
 # Symbol visibility
 if cc.get_id() == 'msvc'
@@ -309,19 +310,13 @@ endif
 
 # X11 checks are for sys/ and tests/
 x11_dep = dependency('x11', required : get_option('x11'))
-# GLib checks are for the entire project
-# Almost everything that uses glib also uses gobject
-glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libglib_dep']),
-             dependency('gobject-2.0', fallback: ['glib', 'libgobject_dep'])]
 # GIO is used by the GIO plugin, and by the TCP, SDP, and RTSP plugins
-gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
+gio_dep = dependency('gio-2.0', version: glib_req)
 giounix_dep = dependency('', required: false)
 if host_system != 'windows'
-  giounix_dep = dependency('gio-unix-2.0', version : glib_req,
-                           fallback: ['glib', 'libgiounix_dep'])
+  giounix_dep = dependency('gio-unix-2.0')
 endif
-gmodule_dep = dependency('gmodule-no-export-2.0',
-                         fallback: ['glib', 'libgmodule_dep'])
+gmodule_dep = dependency('gmodule-no-export-2.0')
 
 # some of the examples can use gdk-pixbuf and GTK+3
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples'))
@@ -477,14 +472,11 @@ subdir('gst-libs')
 subdir('gst')
 subdir('ext')
 subdir('sys')
-if not get_option('tools').disabled()
-  subdir('tools')
-endif
+subdir('tools')
 subdir('tests')
 
 # xgettext is optional (on Windows for instance)
 if find_program('xgettext', required : get_option('nls')).found()
-  core_conf.set('ENABLE_NLS', 1)
   subdir('po')
 endif
 subdir('docs')
@@ -492,6 +484,7 @@ subdir('scripts')
 
 base_libraries = ['allocators', 'app', 'audio', 'fft', 'pbutils', 'riff', 'rtp', 'rtsp', 'sdp', 'tag', 'video']
 if build_gstgl
+  core_conf.set('HAVE_GL', 1)
   base_libraries += 'gl'
 endif