From 3b7de7e3b1f424ba9c3c1afca60570e559464760 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 22 Apr 2019 12:51:33 +0300 Subject: [PATCH] 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. --- ext/dvdread/meson.build | 2 -- meson.build | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) 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') -- 2.34.1