diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-05 19:30:42 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-05 20:06:39 +0530 |
| commit | feac77ace33199c75b29c88db3c7d160fc2a0a1b (patch) | |
| tree | 3f474ff78945fe58ed7e25379f7c20df553a709b /meson.build | |
| parent | 0b9517cc96b745709f30f99f22172553d9f5110f (diff) | |
| download | gstreamer-plugins-bad-feac77ace33199c75b29c88db3c7d160fc2a0a1b.tar.gz | |
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.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index f68d08816..c4e5067c1 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);' + \ |