From feac77ace33199c75b29c88db3c7d160fc2a0a1b Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Sat, 5 May 2018 19:30:42 +0530
Subject: [PATCH] meson: Update option names to omit disable_ and with-
 prefixes

Also yield common options to the outer project (gst-build in our case)
so that they don't have to be set manually.
---
 meson.build             | 12 ++++++------
 meson_options.txt       | 19 ++++++++++---------
 tests/check/meson.build |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/meson.build b/meson.build
index f68d088167..c4e5067c1b 100644
--- a/meson.build
+++ b/meson.build
@@ -320,7 +320,7 @@ foreach extra_arg : warning_flags
 endforeach
 
 # GStreamer package name and origin url
-gst_package_name = get_option('with-package-name')
+gst_package_name = get_option('package-name')
 if gst_package_name == ''
   if gst_version_nano == 0
     gst_package_name = 'GStreamer Bad Plug-ins source release'
@@ -331,7 +331,7 @@ if gst_package_name == ''
   endif
 endif
 cdata.set_quoted('GST_PACKAGE_NAME', gst_package_name)
-cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('with-package-origin'))
+cdata.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))
 
 # FIXME: This should be exposed as a configuration option
 host_system = host_machine.system()
@@ -456,8 +456,8 @@ endif
 
 have_orcc = false
 orcc_args = []
-if get_option('use_orc') != 'no'
-  need_orc = get_option('use_orc') == 'yes'
+if get_option('orc') != 'no'
+  need_orc = get_option('orc') == 'yes'
   # Used by various libraries/elements that use Orc code
   orc_dep = dependency('orc-0.4', required : need_orc)
   orcc = find_program('orcc', required : need_orc)
@@ -474,7 +474,7 @@ else
 endif
 
 if gst_dep.type_name() == 'internal'
-  gst_debug_disabled = subproject('gstreamer').get_variable('disable_gst_debug')
+  gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')
 else
   # We can't check that in the case of subprojects as we won't
   # be able to build against an internal dependency (which is not built yet)
@@ -493,7 +493,7 @@ python3 = import('python3').find_python()
 
 gir = find_program('g-ir-scanner', required : false)
 gnome = import('gnome')
-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection')
+build_gir = gir.found() and not meson.is_cross_build() and get_option('introspection')
 gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
     'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
     'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \
diff --git a/meson_options.txt b/meson_options.txt
index 67c6904a65..eb1cff59dc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,10 +1,11 @@
-option('use_orc', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto')
-option('disable_introspection',
-        type : 'boolean', value : false,
-        description : 'Whether to disable the introspection generation')
-option('with-package-name', type : 'string',
-       description : 'package name to use in plugins')
-option('with-package-origin', type : 'string', value : 'Unknown package origin',
-       description : 'package origin URL to use in plugins')
-option('enable_gst_player_tests', type: 'boolean', value: false,
+option('gst_player_tests', type: 'boolean', value: false,
        description: 'Enable GstPlayer tests that need network access')
+
+# Common options
+option('orc', type : 'combo', choices : ['yes', 'no', 'auto'], value : 'auto', yield : true)
+option('introspection', type : 'boolean', value : true, yield : true,
+        description : 'Generate gobject-introspection bindings')
+option('package-name', type : 'string', yield : true,
+       description : 'package name to use in plugins')
+option('package-origin', type : 'string', value : 'Unknown package origin', yield : true,
+       description : 'package origin URL to use in plugins')
diff --git a/tests/check/meson.build b/tests/check/meson.build
index 9bfac48cab..b7bbf05fbf 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -1,4 +1,4 @@
-have_registry = true # FIXME not get_option('disable_registry')
+have_registry = true # FIXME get_option('registry')
 
 libparser = static_library('parser',
   'elements/parser.c',
@@ -11,7 +11,7 @@ libparser_dep = declare_dependency(link_with: libparser,
 
 exif_dep = dependency('libexif', version : '>= 0.6.16', required : false)
 
-enable_gst_player_tests = get_option('enable_gst_player_tests')
+enable_gst_player_tests = get_option('gst_player_tests')
 
 # name, condition when to skip the test and extra dependencies
 base_tests = [