Revert "meson: Use feature for GStreamer and make it auto"rhel-8.0

This reverts commit 795b352cbaf68ce6f05ab9e9d46d4eff39ffee14.

4 files changed, 16 insertions, 24 deletions

diff --git a/meson.build b/meson.build
index 3c3b6dfb..d54f0d42 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('pipewire', 'c',
   version : '0.2.5',
-  meson_version : '>= 0.47.0',
+  meson_version : '>= 0.45.0',
   default_options : [ 'warning_level=1',
                       'c_std=gnu99',
                       'buildtype=debugoptimized' ])
@@ -161,25 +161,16 @@ dl_lib = cc.find_library('dl', required : false)
 pthread_lib = dependency('threads')
 dbus_dep = dependency('dbus-1')
 
-if not get_option('gstreamer').disabled()
-  build_gst = true
-  glib_dep = [dependency('glib-2.0', version : '>=2.32.0', required: get_option('gstreamer'))]
-  gobject_dep = [dependency('gobject-2.0', required: get_option('gstreamer'))]
-  gmodule_dep = [dependency('gmodule-2.0', required: get_option('gstreamer'))]
-  gio_dep = [dependency('gio-2.0', required: get_option('gstreamer')), dependency('gio-unix-2.0', required: get_option('gstreamer'))]
-  gst_dep = [dependency('gstreamer-1.0', required: get_option('gstreamer')),
-             dependency('gstreamer-plugins-base-1.0', required: get_option('gstreamer')),
-             dependency('gstreamer-video-1.0', required: get_option('gstreamer')),
-             dependency('gstreamer-audio-1.0', required: get_option('gstreamer')),
-             dependency('gstreamer-allocators-1.0', required: get_option('gstreamer')),]
-  foreach dep: glib_dep + gobject_dep + gio_dep + gst_dep
-    if build_gst and not dep.found()
-      build_gst = false
-      message('@0@ not found, disabling GStreamer'.format(dep))
-    endif
-  endforeach
-else
-  build_gst = false
+if get_option('gstreamer')
+  glib_dep = dependency('glib-2.0', version : '>=2.32.0')
+  gobject_dep = dependency('gobject-2.0')
+  gmodule_dep = dependency('gmodule-2.0')
+  gio_dep = [dependency('gio-2.0'), dependency('gio-unix-2.0')]
+  gst_dep = [dependency('gstreamer-1.0'),
+             dependency('gstreamer-plugins-base-1.0'),
+             dependency('gstreamer-video-1.0'),
+             dependency('gstreamer-audio-1.0'),
+             dependency('gstreamer-allocators-1.0'),]
 endif
 
 subdir('spa')
diff --git a/meson_options.txt b/meson_options.txt
index 5ea74ff0..3d21b2b4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,8 +8,8 @@ option('man',
        value: false)
 option('gstreamer',
        description: 'Build GStreamer plugins',
-       type: 'feature',
-       value: 'auto')
+       type: 'boolean',
+       value: false)
 option('systemd',
        description: 'Enable systemd integration',
        type: 'boolean',
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index f2a327fb..4a7d9536 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -13,11 +13,12 @@ pipewire_c_args = [
   '-DG_LOG_DOMAIN=g_log_domain_pipewire',
 ]
 
+conf_config = configuration_data()
 conf_install_dir = join_paths(get_option('sysconfdir'), 'pipewire')
 
 configure_file(input : 'pipewire.conf.in',
                output : 'pipewire.conf',
-               copy : true,
+               configuration : conf_config,
                install_dir : conf_install_dir)
 
 
diff --git a/src/meson.build b/src/meson.build
index 723e2c69..0ad7778d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,6 +6,6 @@ subdir('tools')
 subdir('modules')
 subdir('examples')
 
-if build_gst
+if get_option('gstreamer')
   subdir('gst')
 endif