mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Convert common options to feature options

Browse source 
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:
Nirbheek Chauhan 2018-07-25 17:17:21 +05:30
parent ff4cca75b2
commit af94a5550d
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
meson.build
View file

@ -1,6 +1,6 @@
project('gst-plugins-ugly', 'c', project('gst-plugins-ugly', 'c',
version : '1.15.0.1', version : '1.15.0.1',
meson_version : '>= 0.46.0', meson_version : '>= 0.47',
default_options : [ 'warning_level=1', default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ]) 'buildtype=debugoptimized' ])
@ -119,9 +119,6 @@ cdata.set_quoted('PACKAGE', 'gst-plugins-ugly')
cdata.set_quoted('GST_LICENSE', 'LGPL') cdata.set_quoted('GST_LICENSE', 'LGPL')
cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-ugly-1.0') cdata.set_quoted('GETTEXT_PACKAGE', 'gst-plugins-ugly-1.0')
cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir'))) 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 # GStreamer package name and origin url
gst_package_name = get_option('package-name') gst_package_name = get_option('package-name')
@ -178,8 +175,6 @@ else
cdata.set('DISABLE_ORC', 1) cdata.set('DISABLE_ORC', 1)
endif endif
configure_file(output : 'config.h', configuration : cdata)
ugly_args = ['-DHAVE_CONFIG_H'] ugly_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.') configinc = include_directories('.')
libsinc = include_directories('gst-libs') libsinc = include_directories('gst-libs')
@ -252,9 +247,12 @@ subdir('ext')
subdir('tests') subdir('tests')
# xgettext is optional (on Windows for instance) # 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') subdir('po')
endif endif
configure_file(output : 'config.h', configuration : cdata)
python3 = import('python3').find_python() python3 = import('python3').find_python()
run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")') run_command(python3, '-c', 'import shutil; shutil.copy("hooks/pre-commit.hook", ".git/hooks/pre-commit")')

4
meson_options.txt
View file

@ -2,8 +2,8 @@ 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')
# Common options # Common options
option('nls', type : 'boolean', value : true, yield: true, option('nls', type : 'feature', value : 'auto', yield: true,
description : 'Enable native language support (translations)') description : 'Enable native language support (translations)')
option('package-name', type : 'string', yield : true, option('package-name', type : 'string', yield : true,
description : 'package name to use in plugins') description : 'package name to use in plugins')
option('package-origin', type : 'string', value : 'Unknown package origin', yield: true, option('package-origin', type : 'string', value : 'Unknown package origin', yield: true,