From: Sebastian Dröge <sebastian@centricular.com>
Date: Mon, 22 Apr 2019 09:51:33 +0000 (+0300)
Subject: meson: Always require the gmodule dependency
X-Git-Tag: 1.16.2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b7de7e3b1f424ba9c3c1afca60570e559464760;p=platform%2Fupstream%2Fgst-plugins-ugly.git

meson: Always require the gmodule dependency

It's needed by the dvdread plugin but also by the x264 plugin in certain
circumstances. As it's part of GLib and always available, simply move it
as a hard dependency to the top-level meson.build.
---

diff --git a/ext/dvdread/meson.build b/ext/dvdread/meson.build
index ae5a7a61..e3855722 100644
--- a/ext/dvdread/meson.build
+++ b/ext/dvdread/meson.build
@@ -1,5 +1,3 @@
-gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep'],
-                         required : get_option('dvdread'))
 dvdread_dep = dependency('dvdread', version : '>= 0.5.0', required : get_option('dvdread'))
 
 if gmodule_dep.found() and dvdread_dep.found()
diff --git a/meson.build b/meson.build
index e7fa48eb..9d770904 100644
--- a/meson.build
+++ b/meson.build
@@ -155,6 +155,8 @@ else
   cdata.set('DISABLE_ORC', 1)
 endif
 
+gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep'])
+
 ugly_args = ['-DHAVE_CONFIG_H']
 configinc = include_directories('.')
 libsinc = include_directories('gst-libs')