mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-31 20:48:56 +00:00
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.
This commit is contained in:
parent
ca522652ed
commit
720fc4ffef
2 changed files with 7 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
project('gst-libav', 'c', 'cpp',
|
||||
version : '1.15.0.1',
|
||||
meson_version : '>= 0.36.0',
|
||||
meson_version : '>= 0.46.0',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
||||
|
@ -41,7 +41,7 @@ cdata.set('PACKAGE_VERSION', '"@0@"'.format(gst_version))
|
|||
cdata.set('PACKAGE', '"gst-libav"')
|
||||
|
||||
# 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 FFMPEG Plug-ins source release'
|
||||
|
@ -52,7 +52,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'))
|
||||
|
||||
|
||||
check_headers = [['unistd.h', 'HAVE_UNISTD_H']]
|
||||
|
@ -108,7 +108,7 @@ endif
|
|||
if gst_dep.type_name() == 'internal'
|
||||
gst_proj = subproject('gstreamer')
|
||||
|
||||
if gst_proj.get_variable('disable_gst_debug')
|
||||
if not gst_proj.get_variable('gst_debug')
|
||||
message('GStreamer debug system is disabled')
|
||||
add_project_arguments('-Wno-unused', language: 'c')
|
||||
else
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
option('with-package-name', type : 'string',
|
||||
option('package-name', type : 'string', yield : true,
|
||||
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')
|
||||
|
|
Loading…
Reference in a new issue