[rygel] build: Use meson feature for GStreamer and GTK

[Jens Georg <jensgeorg src gnome org>]

commit 7e1819d9e49084c9dc55064a6f21d0f7caa90da6
Author: Jens Georg <mail jensge org>
Date:   Tue Oct 29 15:15:28 2019 +0100

    build: Use meson feature for GStreamer and GTK

 meson.build                          | 32 +++++++++-----------------------
 meson_options.txt                    |  4 ++--
 src/plugins/media-export/meson.build |  2 +-
 3 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/meson.build b/meson.build
index a523ae7a..3f8671cf 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('rygel', 'vala', 'c', version : '0.39.0')
+project('rygel', 'vala', 'c', version : '0.39.0', meson_version : '>= 0.50.0')
 vala = meson.get_compiler('vala')
 
 # Check for the required vala version
@@ -81,31 +81,17 @@ soup = dependency('libsoup-2.4', version : '>= 2.44.0')
 mediaart = dependency('libmediaart-2.0', version : '>= 0.7.0')
 sqlite = dependency('sqlite3', version : '>= 3.5')
 
-if get_option('gstreamer')
-    gstreamer = dependency('gstreamer-1.0', version : '>= 1.0')
-    gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
-    gstreamer_base = dependency('gstreamer-base-1.0', version : '>= 1.0')
-    gstreamer_audio = dependency('gstreamer-audio-1.0', version : '>= 1.0')
-    gstreamer_video = dependency('gstreamer-video-1.0', version : '>= 1.0')
-    gstreamer_tag = dependency('gstreamer-tag-1.0', version : '>= 1.0')
-    gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4')
-else
-    gstreamer = disabler()
-    gstreamer_pbu = disabler()
-    gstreamer_base = disabler()
-    gstreamer_audio = disabler()
-    gstreamer_video = disabler()
-    gstreamer_tag = disabler()
-    gupnp_dlna_gst = disabler()
-endif
+gstreamer = dependency('gstreamer-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gstreamer_base = dependency('gstreamer-base-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gstreamer_audio = dependency('gstreamer-audio-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gstreamer_video = dependency('gstreamer-video-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gstreamer_tag = dependency('gstreamer-tag-1.0', version : '>= 1.0', disabler: true, required: 
get_option('gstreamer'))
+gupnp_dlna_gst = dependency('gupnp-dlna-gst-2.0', version: '>= 0.9.4', disabler: true, required: 
get_option('gstreamer'))
 
 gdk_pixbuf = dependency('gdk-pixbuf-2.0')
 
-if get_option('gtk')
-    gtk = dependency('gtk+-3.0', version : '>= 3.0')
-else
-    gtk = disabler()
-endif
+gtk = dependency('gtk+-3.0', version : '>= 3.0', disabler: true, required: get_option('gtk'))
 
 posix = vala.find_library('posix')
 
diff --git a/meson_options.txt b/meson_options.txt
index b987ee51..6de516f8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -5,6 +5,6 @@ option('plugins', type : 'array', choices : ['external', 'gst-launch', 'lms', 'm
 option('engines', type : 'array', choices : ['simple', 'gstreamer'])
 option('examples', type : 'boolean', value : 'true')
 option('tests', type : 'boolean', value : 'true')
-option('gstreamer', type : 'boolean', value : 'true')
-option('gtk', type : 'boolean', value : 'true')
+option('gstreamer', type : 'feature', value : 'enabled')
+option('gtk', type : 'feature', value : 'enabled')
 option('introspection', type: 'feature', value : 'auto')
diff --git a/src/plugins/media-export/meson.build b/src/plugins/media-export/meson.build
index 46f9918c..583ccabb 100644
--- a/src/plugins/media-export/meson.build
+++ b/src/plugins/media-export/meson.build
@@ -19,7 +19,7 @@ mx_extract_sources = [
 
 mx_extract = executable('mx-extract',
                         mx_extract_sources,
-                        dependencies : [mx_export_deps, gssdp],
+                        dependencies : mx_export_deps + [gssdp],
                         c_args : ['-DG_LOG_DOMAIN="MxExtract"'],
                         link_with: constants,
                         install: true,