mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Update option names to omit disable_ and with- prefixes

Browse source 
Also yield common options to the outer project (gst-build in our case)
so that they don't have to be set manually.
This commit is contained in:
Nirbheek Chauhan 2018-05-05 19:32:00 +05:30
parent c789277ec0
commit ac90718ffc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson.build
View file

@ -120,7 +120,7 @@ cdata.set('GETTEXT_PACKAGE', '"gst-plugins-ugly-1.0"')
cdata.set('GST_LICENSE', '"LGPL"') cdata.set('GST_LICENSE', '"LGPL"')
# GStreamer package name and origin url # 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_package_name == ''
if gst_version_nano == 0 if gst_version_nano == 0
gst_package_name = 'GStreamer Ugly Plug-ins source release' gst_package_name = 'GStreamer Ugly Plug-ins source release'
@ -131,7 +131,7 @@ if gst_package_name == ''
endif endif
endif endif
cdata.set_quoted('GST_PACKAGE_NAME', gst_package_name) 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'))
# Mandatory GST deps # Mandatory GST deps
gst_dep = dependency('gstreamer-1.0', version : gst_req, gst_dep = dependency('gstreamer-1.0', version : gst_req,
@ -181,7 +181,7 @@ configinc = include_directories('.')
libsinc = include_directories('gst-libs') libsinc = include_directories('gst-libs')
if gst_dep.type_name() == 'internal' 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 else
# We can't check that in the case of subprojects as we won't # 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) # be able to build against an internal dependency (which is not built yet)

6
meson_options.txt
View file

@ -1,6 +1,8 @@
option('x264_libraries', type : 'string', value : '', option('x264_libraries', type : 'string', value : '',
description : 'Colon separated list of additional x264 library paths, e.g. for 10-bit version') description : 'Colon separated list of additional x264 library paths, e.g. for 10-bit version')
option('with-package-name', type : 'string',
# Common options
option('package-name', type : 'string', yield : true,
description : 'package name to use in plugins') description : 'package name to use in plugins')
option('with-package-origin', type : 'string', value : 'Unknown package origin', option('package-origin', type : 'string', value : 'Unknown package origin', yield: true,
description : 'package origin URL to use in plugins') description : 'package origin URL to use in plugins')