mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
meson: Convert common options to feature options
The rest will be converted later, these are necessary for gst-build to set options correctly. https://bugzilla.gnome.org/show_bug.cgi?id=795107
This commit is contained in:
parent
ff4cca75b2
commit
af94a5550d
2 changed files with 7 additions and 9 deletions
12
meson.build
12
meson.build
|
@ -1,6 +1,6 @@
|
|||
project('gst-plugins-ugly', 'c',
|
||||
version : '1.15.0.1',
|
||||
meson_version : '>= 0.46.0',
|
||||
meson_version : '>= 0.47',
|
||||
default_options : [ 'warning_level=1',
|
||||
'buildtype=debugoptimized' ])
|
||||
|
||||
|
@ -119,9 +119,6 @@ cdata.set_quoted('PACKAGE', 'gst-plugins-ugly')
|
|||
cdata.set_quoted('GST_LICENSE', 'LGPL')
|
||||
cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-ugly-1.0')
|
||||
cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
|
||||
if get_option('nls')
|
||||
cdata.set('ENABLE_NLS', 1)
|
||||
endif
|
||||
|
||||
# GStreamer package name and origin url
|
||||
gst_package_name = get_option('package-name')
|
||||
|
@ -178,8 +175,6 @@ else
|
|||
cdata.set('DISABLE_ORC', 1)
|
||||
endif
|
||||
|
||||
configure_file(output : 'config.h', configuration : cdata)
|
||||
|
||||
ugly_args = ['-DHAVE_CONFIG_H']
|
||||
configinc = include_directories('.')
|
||||
libsinc = include_directories('gst-libs')
|
||||
|
@ -252,9 +247,12 @@ subdir('ext')
|
|||
subdir('tests')
|
||||
|
||||
# xgettext is optional (on Windows for instance)
|
||||
if get_option('nls') and find_program('xgettext', required : false).found()
|
||||
if find_program('xgettext', required : get_option('nls')).found()
|
||||
cdata.set('ENABLE_NLS', 1)
|
||||
subdir('po')
|
||||
endif
|
||||
|
||||
configure_file(output : 'config.h', configuration : cdata)
|
||||
|
||||
python3 = import('python3').find_python()
|
||||
run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')
|
||||
|
|
|
@ -2,7 +2,7 @@ option('x264_libraries', type : 'string', value : '',
|
|||
description : 'Colon separated list of additional x264 library paths, e.g. for 10-bit version')
|
||||
|
||||
# Common options
|
||||
option('nls', type : 'boolean', value : true, yield: true,
|
||||
option('nls', type : 'feature', value : 'auto', yield: true,
|
||||
description : 'Enable native language support (translations)')
|
||||
option('package-name', type : 'string', yield : true,
|
||||
description : 'package name to use in plugins')
|
||||
|
|
Loading…
Reference in a new issue