From f242e3c7eb5b0e56724194b3624377bdff467516 Mon Sep 17 00:00:00 2001 From: Johannes Kauffmann Date: Wed, 11 Jan 2023 16:25:07 +0100 Subject: [PATCH] meson: fix named argument style As per the style guide. --- include/meson.build | 4 +- meson.build | 44 +++++++++++----------- modules/access/http/meson.build | 62 +++++++++++++++---------------- modules/access/meson.build | 2 +- modules/audio_filter/meson.build | 6 +-- modules/codec/meson.build | 26 ++++++------- modules/control/meson.build | 2 +- modules/demux/meson.build | 26 ++++++------- modules/gui/qt/meson.build | 10 ++--- modules/logger/meson.build | 2 +- modules/meson.build | 46 +++++++++++------------ modules/misc/meson.build | 18 ++++----- modules/video_chroma/meson.build | 2 +- modules/video_output/meson.build | 8 ++-- modules/visualization/meson.build | 8 ++-- src/meson.build | 14 +++---- 16 files changed, 140 insertions(+), 140 deletions(-) diff --git a/include/meson.build b/include/meson.build index 7c9b8964fc..0e0aef9f3c 100644 --- a/include/meson.build +++ b/include/meson.build @@ -13,7 +13,7 @@ install_headers( 'vlc/libvlc_renderer_discoverer.h', 'vlc/deprecated.h', 'vlc/libvlc_version.h', - subdir : 'vlc') + subdir: 'vlc') # Install VLC plugin headers install_headers( @@ -115,4 +115,4 @@ install_headers( 'vlc_window.h', 'vlc_xlib.h', 'vlc_xml.h', - subdir : 'vlc/plugins') + subdir: 'vlc/plugins') diff --git a/meson.build b/meson.build index 9f7940e60f..821320ad89 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('VLC', ['c', 'cpp'], - version : '4.0.0-dev', - default_options : ['c_std=gnu11', 'cpp_std=c++14'], - meson_version : '>=0.60.0') + version: '4.0.0-dev', + default_options: ['c_std=gnu11', 'cpp_std=c++14'], + meson_version: '>=0.60.0') vlc_copyright_years = '1996-2018' vlc_version_codename = 'Otto Chriek' @@ -53,7 +53,7 @@ vlc_about = custom_target('vlc_about.h', '@INPUT2@', '@OUTPUT@']) -add_project_arguments('-DHAVE_CONFIG_H=1', language : ['c', 'cpp', 'objc']) +add_project_arguments('-DHAVE_CONFIG_H=1', language: ['c', 'cpp', 'objc']) # If building with contribs, read the relevant paths from the machine file # to use it during checks (check_header, find_library) later. @@ -256,11 +256,11 @@ if host_system == 'darwin' # Check if compiling for iOS have_ios = cc.get_define('TARGET_OS_IPHONE', - prefix : '#include ') == '1' + prefix: '#include ') == '1' # Check if compiling for tvOS have_tvos = cc.get_define('TARGET_OS_TV', - prefix : '#include ') == '1' + prefix: '#include ') == '1' # If none of the above, assume compiling for macOS have_osx = not have_ios and not have_tvos @@ -320,7 +320,7 @@ windows_version_test = ''' # Check which kind of MinGW mingw_version_major = cc.get_define('__MINGW64_VERSION_MAJOR', - prefix : '#include <_mingw.h>') + prefix: '#include <_mingw.h>') if mingw_version_major == '' error('Cannot compile with MinGW, use MinGW-w64 >= 5.0 instead.') @@ -334,7 +334,7 @@ windows_version_test = ''' have_mingw = true mingw_version_minor = cc.get_define('__MINGW64_VERSION_MINOR', - prefix : '#include <_mingw.h>') + prefix: '#include <_mingw.h>') mingw_version = '@0@.@1@'.format(mingw_version_major, mingw_version_minor) message('Using MinGW-w64 ' + mingw_version) @@ -359,7 +359,7 @@ windows_version_test = ''' endforeach # Check for the need to link to the mingwex lib for MinGW-w64 32bit - mingwex_lib = cc.find_library('mingwex', required : false) + mingwex_lib = cc.find_library('mingwex', required: false) if mingwex_lib.found() and not cc.find_library('mingw32', required: false).found() mingw_libs += mingwex_lib @@ -371,17 +371,17 @@ windows_version_test = ''' # Check for fnative-struct or mms-bitfields support for MinGW if cc.has_argument('-mms-bitfields') add_project_arguments('-mms-bitfields', - language : ['c', 'cpp']) + language: ['c', 'cpp']) # Check for the warning flag without "-Wno-", GCC accepts # -Wno- for unsupported warnings, which can trigger # other warnings instead. if cc.has_argument('-Wincompatible-ms-struct') add_project_arguments('-Wno-incompatible-ms-struct', - language : ['c', 'cpp']) + language: ['c', 'cpp']) endif elif cc.has_argument('-fnative-struct') add_project_arguments('-fnative-struct', - language : ['c', 'cpp']) + language: ['c', 'cpp']) endif # DEP, ASLR, NO SEH @@ -404,9 +404,9 @@ windows_version_test = ''' endif if cc.has_argument('-Werror-implicit-function-declaration') - add_project_arguments('-Werror-implicit-function-declaration', language : ['c', 'cpp']) + add_project_arguments('-Werror-implicit-function-declaration', language: ['c', 'cpp']) elif cc.has_argument('-we4013') - add_project_arguments('-we4013', language : ['c', 'cpp']) + add_project_arguments('-we4013', language: ['c', 'cpp']) endif # @@ -524,7 +524,7 @@ foreach f : check_functions # then not found using the other header, it would overwrite # the previous value! - if cc.has_function(f[0], prefix : vlc_conf_prefix + f[1], dependencies: [socket_libs]) + if cc.has_function(f[0], prefix: vlc_conf_prefix + f[1], dependencies: [socket_libs]) cdata.set('HAVE_' + f[0].underscorify().to_upper(), 1) endif endforeach @@ -596,7 +596,7 @@ endif # Check all functions in libcompat_functions array foreach f : libcompat_functions - if cc.has_function(f[0], prefix : vlc_conf_prefix + f[1], dependencies: [rt_lib, socket_libs]) + if cc.has_function(f[0], prefix: vlc_conf_prefix + f[1], dependencies: [rt_lib, socket_libs]) cdata.set('HAVE_' + f[0].underscorify().to_upper(), 1) else libcompat_sources += f[0] + '.c' @@ -614,7 +614,7 @@ libcompat_functions = [ ] foreach f : libcompat_functions - if cc.has_header_symbol(f[1], f[0], prefix : vlc_conf_prefix) + if cc.has_header_symbol(f[1], f[0], prefix: vlc_conf_prefix) cdata.set('HAVE_' + f[0].underscorify().to_upper(), 1) else libcompat_sources += f[0] + '.c' @@ -691,7 +691,7 @@ endif # Check for __attribute__((packed)) support if cc.compiles('struct __attribute__((packed)) foo { int bar; };', - name : '__attribute__((packed))') + name: '__attribute__((packed))') cdata.set('HAVE_ATTRIBUTE_PACKED', 1) endif @@ -726,7 +726,7 @@ endif # Add -fvisibility=hidden if compiler supports those add_project_arguments( cc.get_supported_arguments('-fvisibility=hidden'), - language : ['c']) + language: ['c']) # Check for struct sockaddr_storage type # Define it to `sockaddr` if missing @@ -768,16 +768,16 @@ if cc.has_type('struct pollfd', prefix: '\n'.join([vlc_conf_prefix, pollfd_prefi endif # Check for if_nameindex function and struct -if cc.has_function('if_nameindex', prefix : '#include ') +if cc.has_function('if_nameindex', prefix: '#include ') cdata.set('HAVE_IF_NAMEINDEX', 1) endif -if cc.has_type('struct if_nameindex', prefix : '#include ') +if cc.has_type('struct if_nameindex', prefix: '#include ') cdata.set('HAVE_STRUCT_IF_NAMEINDEX', 1) endif # Check for locale_t type in C++ locale header -if cpp.has_type('locale_t', prefix : '#include ') +if cpp.has_type('locale_t', prefix: '#include ') cdata.set('HAVE_CXX_LOCALE_T', 1) endif diff --git a/modules/access/http/meson.build b/modules/access/http/meson.build index 73d83bb0d1..f7b1104902 100644 --- a/modules/access/http/meson.build +++ b/modules/access/http/meson.build @@ -22,7 +22,7 @@ vlc_http_lib = static_library('vlc_http', dependencies: [threads_dep, socket_libs, libvlccore_dep], link_with: [vlc_libcompat], install: false, - include_directories : [vlc_include_dirs], + include_directories: [vlc_include_dirs], ) # @@ -30,13 +30,13 @@ vlc_http_lib = static_library('vlc_http', # hpack_test = executable('hpack_test', files('hpack.c'), - c_args : ['-DDEC_TEST'], - include_directories : [vlc_include_dirs]) + c_args: ['-DDEC_TEST'], + include_directories: [vlc_include_dirs]) hpackenc_test = executable('hpackenc_test', files('hpack.c', 'hpackenc.c'), - c_args : ['-DENC_TEST'], - link_with : vlc_libcompat, - include_directories : [vlc_include_dirs]) + c_args: ['-DENC_TEST'], + link_with: vlc_libcompat, + include_directories: [vlc_include_dirs]) h2frame_test = executable('h2frame_test', files( 'h2frame_test.c', @@ -44,46 +44,46 @@ h2frame_test = executable('h2frame_test', 'hpackenc.c', 'h2frame.c', ), - include_directories : [vlc_include_dirs]) + include_directories: [vlc_include_dirs]) h2output_test = executable('h2output_test', files('h2output_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) h2conn_test = executable('h2conn_test', files('h2conn_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) h1conn_test = executable('h1conn_test', files('h1conn_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) h1chunked_test = executable('h1chunked_test', files('chunked_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) http_msg_test = executable('http_msg_test', files('message_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) http_file_test = executable('http_file_test', files('file_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) http_tunnel_test = executable('http_tunnel_test', files('tunnel_test.c'), - link_with : vlc_http_lib, - include_directories : [vlc_include_dirs]) + link_with: vlc_http_lib, + include_directories: [vlc_include_dirs]) -test('http_hpack', hpack_test, suite : 'http') -test('http_hpackenc', hpackenc_test, suite : 'http') -test('http_h2frame_test', h2frame_test, suite : 'http') -test('http_h2output_test', h2output_test, suite : 'http') -test('http_h2conn_test', h2conn_test, suite : 'http') -test('http_h1conn_test', h1conn_test, suite : 'http') -test('http_h1chunked_test', h1chunked_test, suite : 'http') -test('http_msg_test', http_msg_test, suite : 'http') -test('http_file_test', http_file_test, suite : 'http') -test('http_tunnel_test', http_tunnel_test, suite : 'http', timeout : 90) +test('http_hpack', hpack_test, suite: 'http') +test('http_hpackenc', hpackenc_test, suite: 'http') +test('http_h2frame_test', h2frame_test, suite: 'http') +test('http_h2output_test', h2output_test, suite: 'http') +test('http_h2conn_test', h2conn_test, suite: 'http') +test('http_h1conn_test', h1conn_test, suite: 'http') +test('http_h1chunked_test', h1chunked_test, suite: 'http') +test('http_msg_test', http_msg_test, suite: 'http') +test('http_file_test', http_file_test, suite: 'http') +test('http_tunnel_test', http_tunnel_test, suite: 'http', timeout: 90) # diff --git a/modules/access/meson.build b/modules/access/meson.build index 0700aecf7c..e038e96e08 100644 --- a/modules/access/meson.build +++ b/modules/access/meson.build @@ -204,7 +204,7 @@ if get_option('vcd_module') vcd_cdda_flags = [] # TODO: Add gcrypt dependency if it's present - libcddb_dep = dependency('libcddb', version : '>= 0.9.5', required : get_option('libcddb')) + libcddb_dep = dependency('libcddb', version: '>= 0.9.5', required: get_option('libcddb')) if libcddb_dep.found() vcd_cdda_flags += '-DHAVE_LIBCDDB' endif diff --git a/modules/audio_filter/meson.build b/modules/audio_filter/meson.build index 0255450e4d..2c6403354e 100644 --- a/modules/audio_filter/meson.build +++ b/modules/audio_filter/meson.build @@ -153,7 +153,7 @@ vlc_modules += { # simple_channel_mixer_plugin_arm_neon # Spatial audio (ambisonics/binaural) mixer -spatial_dep = dependency('spatialaudio', required : get_option('spatialaudio')) +spatial_dep = dependency('spatialaudio', required: get_option('spatialaudio')) if spatial_dep.found() vlc_modules += { 'name' : 'spatialaudio', @@ -228,7 +228,7 @@ if ebur128_dep.found() endif # Speex resampler -speexdsp_dep = dependency('speexdsp', required : get_option('speexdsp')) +speexdsp_dep = dependency('speexdsp', required: get_option('speexdsp')) if speexdsp_dep.found() vlc_modules += { 'name' : 'speex_resampler', @@ -238,7 +238,7 @@ if speexdsp_dep.found() endif # Rnnoise denoiser -rnnoise_dep = dependency('rnnoise', required : get_option('rnnoise')) +rnnoise_dep = dependency('rnnoise', required: get_option('rnnoise')) if rnnoise_dep.found() vlc_modules += { 'name' : 'rnnoise', diff --git a/modules/codec/meson.build b/modules/codec/meson.build index 74d762869e..c3299e9d3e 100644 --- a/modules/codec/meson.build +++ b/modules/codec/meson.build @@ -33,7 +33,7 @@ if a52_lib.found() endif # DTS Coherent Acoustics decoder -dca_dep = dependency('libdca', version : '>= 0.0.5', required : get_option('dca')) +dca_dep = dependency('libdca', version: '>= 0.0.5', required: get_option('dca')) if dca_dep.found() vlc_modules += { 'name' : 'dca', @@ -81,9 +81,9 @@ fluidsynth_option = get_option('fluidsynth') fluidsynth_module_flags = [] if not fluidsynth_option.disabled() fluidsynth_module_flags += f'-DDATADIR="@sysdatadir_path@"' - fluidsynth_dep = dependency('fluidsynth', version : '>= 1.1.2', required : false) + fluidsynth_dep = dependency('fluidsynth', version: '>= 1.1.2', required: false) if not fluidsynth_dep.found() - fluidsynth_dep = dependency('fluidlite', required : false) + fluidsynth_dep = dependency('fluidlite', required: false) if fluidsynth_dep.found() fluidsynth_module_flags += '-DHAVE_FLUIDLITE_H' endif @@ -93,7 +93,7 @@ if not fluidsynth_option.disabled() error('Neither fluidsynth or fluidlite were found.') endif else - fluidsynth_dep = dependency('', required : false) + fluidsynth_dep = dependency('', required: false) endif if fluidsynth_dep.found() @@ -121,7 +121,7 @@ vlc_modules += { } # libmad codec -mad_dep = dependency('mad', required : get_option('mad')) +mad_dep = dependency('mad', required: get_option('mad')) if mad_dep.found() vlc_modules += { 'name' : 'mad', @@ -131,7 +131,7 @@ if mad_dep.found() endif # libmpg123 decoder -mpg123_dep = dependency('libmpg123', required : get_option('mpg123')) +mpg123_dep = dependency('libmpg123', required: get_option('mpg123')) if mpg123_dep.found() vlc_modules += { 'name' : 'mpg123', @@ -156,7 +156,7 @@ vlc_modules += { } # libmpeg2 decoder -mpeg2_dep = dependency('libmpeg2', version : '> 0.3.2', required : get_option('mpeg2')) +mpeg2_dep = dependency('libmpeg2', version: '> 0.3.2', required: get_option('mpeg2')) if mpeg2_dep.found() vlc_modules += { 'name' : 'libmpeg2', @@ -218,7 +218,7 @@ if jpeg_dep.found() endif # BPG codec -bpg_lib = cc.find_library('bpg', required : get_option('bpg')) +bpg_lib = cc.find_library('bpg', required: get_option('bpg')) if bpg_lib.found() vlc_modules += { 'name' : 'bpg', @@ -228,7 +228,7 @@ if bpg_lib.found() endif # SVG image decoder -cairo_dep = dependency('cairo', version : '>= 1.13.1', required : get_option('cairo')) +cairo_dep = dependency('cairo', version: '>= 1.13.1', required: get_option('cairo')) if rsvg_dep.found() and cairo_dep.found() vlc_modules += { 'name' : 'svgdec', @@ -238,7 +238,7 @@ if rsvg_dep.found() and cairo_dep.found() endif # xwd -xproto_dep = dependency('xproto', required : get_option('xcb')) +xproto_dep = dependency('xproto', required: get_option('xcb')) if xproto_dep.found() vlc_modules += { 'name' : 'xwd', @@ -292,7 +292,7 @@ vlc_modules += { } # aribsub -aribb24_dep = dependency('aribb24', version : '>= 1.0.1', required : get_option('aribsub')) +aribb24_dep = dependency('aribb24', version: '>= 1.0.1', required: get_option('aribsub')) if aribb24_dep.found() vlc_modules += { 'name' : 'aribsub', @@ -439,7 +439,7 @@ if flex.found() and bison.found() and not get_option('css_engine').disabled() vlc_include_dirs, include_directories('webvtt')]) - test('css_parser', css_parser_test, suite : 'css_parser') + test('css_parser', css_parser_test, suite: 'css_parser') endif @@ -563,7 +563,7 @@ if avcodec_dep.found() files('avcodec/fourcc.c', 'avcodec/chroma.c'), dependencies: [avutil_dep, avcodec_dep], install: false, - include_directories : [ + include_directories: [ vlc_include_dirs, include_directories('avcodec') ], diff --git a/modules/control/meson.build b/modules/control/meson.build index a96715c56e..59f674880a 100644 --- a/modules/control/meson.build +++ b/modules/control/meson.build @@ -67,7 +67,7 @@ vlc_motion_lib = static_library('vlc_motion', ) # DBUS -dbus_dep = dependency('dbus-1', version : '>= 1.6.0', required : get_option('dbus')) +dbus_dep = dependency('dbus-1', version: '>= 1.6.0', required: get_option('dbus')) if dbus_dep.found() vlc_modules += { 'name' : 'dbus', diff --git a/modules/demux/meson.build b/modules/demux/meson.build index 80d6e99a3a..6bbc80dc78 100644 --- a/modules/demux/meson.build +++ b/modules/demux/meson.build @@ -4,10 +4,10 @@ # Common Xiph metadata library xiph_meta_lib = static_library('xiph_metadata', - sources : files('xiph_metadata.c'), - include_directories : [vlc_include_dirs], - install : false, - pic : true + sources: files('xiph_metadata.c'), + include_directories: [vlc_include_dirs], + install: false, + pic: true ) # FLAC demux @@ -19,7 +19,7 @@ vlc_modules += { } # OGG demux -ogg_dep = dependency('ogg', version : '>= 1.0', required : get_option('ogg')) +ogg_dep = dependency('ogg', version: '>= 1.0', required: get_option('ogg')) if ogg_dep.found() vlc_modules += { 'name' : 'ogg', @@ -32,9 +32,9 @@ endif # Xiph test xiph_test = executable('xiph_test', files('xiph_test.c'), - include_directories : [vlc_include_dirs]) + include_directories: [vlc_include_dirs]) -test('xiph_test', hpack_test, suite : 'demux') +test('xiph_test', hpack_test, suite: 'demux') # Demux dump vlc_modules += { @@ -91,8 +91,8 @@ vlc_modules += { } # libmodplug -libmodplug_dep = dependency('libmodplug', version : ['>= 0.8.4', '!= 0.8.8'], - required : get_option('libmodplug')) +libmodplug_dep = dependency('libmodplug', version: ['>= 0.8.4', '!= 0.8.8'], + required: get_option('libmodplug')) if libmodplug_dep.found() vlc_modules += { 'name' : 'mod', @@ -255,8 +255,8 @@ vlc_modules += { } # MKV demux -libebml_dep = dependency('libebml', required : get_option('matroska')) -libmatroska_dep = dependency('libmatroska', required : get_option('matroska')) +libebml_dep = dependency('libebml', required: get_option('matroska')) +libmatroska_dep = dependency('libmatroska', required: get_option('matroska')) if libebml_dep.found() and libmatroska_dep.found() vlc_modules += { 'name' : 'mkv', @@ -326,8 +326,8 @@ vlc_modules += { } # TS demux -aribb24_dep = dependency('aribb24', version : '>= 1.0.1', required : get_option('aribb24')) -libdvbpsi_dep = dependency('libdvbpsi', version : '>= 1.2.0', required : get_option('libdvbpsi')) +aribb24_dep = dependency('aribb24', version: '>= 1.0.1', required: get_option('aribb24')) +libdvbpsi_dep = dependency('libdvbpsi', version: '>= 1.2.0', required: get_option('libdvbpsi')) if libdvbpsi_dep.found() arrib24_define = [] if aribb24_dep.found() diff --git a/modules/gui/qt/meson.build b/modules/gui/qt/meson.build index d786c4f1f7..2933f777db 100644 --- a/modules/gui/qt/meson.build +++ b/modules/gui/qt/meson.build @@ -10,8 +10,8 @@ qt_extra_deps = [] qt_extra_flags = [] qt5_dep = dependency('qt5', - version : '>=5.11.0', - modules : [ + version: '>=5.11.0', + modules: [ 'Core', 'Gui', 'Widgets', 'Svg', 'Qml', 'Quick', 'QuickWidgets', 'QuickControls2', ], @@ -531,9 +531,9 @@ if host_system == 'windows' endif if qt5_dep.found() - qt5pre_files = qt5.preprocess(ui_files : ui_sources, - moc_headers : moc_headers, - qresources : qrc_files, + qt5pre_files = qt5.preprocess(ui_files: ui_sources, + moc_headers: moc_headers, + qresources: qrc_files, include_directories: qt_include_dir) qt_sources = files('qt.cpp') diff --git a/modules/logger/meson.build b/modules/logger/meson.build index 1b022af526..912cb3c390 100644 --- a/modules/logger/meson.build +++ b/modules/logger/meson.build @@ -19,7 +19,7 @@ if cc.check_header('syslog.h') endif # Systemd journal logger -libsystemd_dep = dependency('libsystemd', required : false) +libsystemd_dep = dependency('libsystemd', required: false) if libsystemd_dep.found() vlc_modules += { 'name' : 'sd_journal', diff --git a/modules/meson.build b/modules/meson.build index 59d18a66bb..27bedd9aae 100644 --- a/modules/meson.build +++ b/modules/meson.build @@ -23,21 +23,21 @@ if (host_system != 'darwin' and host_system != 'windows') or get_option('xcb').e xcb_damage_dep = dependency('xcb-damage', required: get_option('xcb')) xcb_xfixes_dep = dependency('xcb-xfixes', required: get_option('xcb')) else - xcb_dep = dependency('', required : false) + xcb_dep = dependency('', required: false) endif # Check for Wayland if (host_system != 'darwin' and host_system != 'windows') or get_option('xcb').enabled() - wayland_scanner_dep = dependency('wayland-scanner', version : '>= 1.15', - required : get_option('wayland'), native : true) + wayland_scanner_dep = dependency('wayland-scanner', version: '>= 1.15', + required: get_option('wayland'), native: true) wayland_protocols_dep = dependency('wayland-protocols', version: '>= 1.15', - required : get_option('wayland')) + required: get_option('wayland')) wayland_deps = [ - dependency('wayland-client', version : '>= 1.5.91', required : get_option('wayland')), - dependency('wayland-cursor', required : get_option('wayland')), - dependency('wayland-egl', required : get_option('wayland')), + dependency('wayland-client', version: '>= 1.5.91', required: get_option('wayland')), + dependency('wayland-cursor', required: get_option('wayland')), + dependency('wayland-egl', required: get_option('wayland')), wayland_scanner_dep, wayland_protocols_dep ] @@ -66,26 +66,26 @@ endif pulse_dep = dependency('libpulse', version: '>= 1.0', required: get_option('pulse')) # ALSA -alsa_dep = dependency('alsa', version : '>= 1.0.24', required : get_option('alsa')) +alsa_dep = dependency('alsa', version: '>= 1.0.24', required: get_option('alsa')) # JACK (TODO: set required based on a get_option()) -jack_dep = dependency('jack', version : '>= 1.9.7', required : false) +jack_dep = dependency('jack', version: '>= 1.9.7', required: false) if not jack_dep.found() # Try jack1 instead - jack_dep = dependency('jack', version : ['>= 0.120.1', '< 1.0'], - required : false) + jack_dep = dependency('jack', version: ['>= 0.120.1', '< 1.0'], + required: false) endif # Darwin-specific dependencies if host_system == 'darwin' - security_dep = dependency('Security', required : true) - coremedia_dep = dependency('CoreMedia', required : true) - avfoundation_dep = dependency('AVFoundation', required : true) - corevideo_dep = dependency('CoreVideo', required : true) - videotoolbox_dep = dependency('VideoToolbox', required : true) + security_dep = dependency('Security', required: true) + coremedia_dep = dependency('CoreMedia', required: true) + avfoundation_dep = dependency('AVFoundation', required: true) + corevideo_dep = dependency('CoreVideo', required: true) + videotoolbox_dep = dependency('VideoToolbox', required: true) audiounit_dep = dependency('AudioUnit', required: true) - audiotoolbox_dep = dependency('AudioToolbox', required : true) - iokit_dep = dependency('IOKit', required : true) + audiotoolbox_dep = dependency('AudioToolbox', required: true) + iokit_dep = dependency('IOKit', required: true) quartz_dep = dependency('QuartzCore', required: true) coretext_dep = dependency('CoreText', required: true) coreaudio_dep = dependency('CoreAudio', required: true) @@ -124,13 +124,13 @@ if pulse_dep.found() endif # SRT -srt_dep = dependency('srt', version : '>=1.3.0', required : get_option('srt')) +srt_dep = dependency('srt', version: '>=1.3.0', required: get_option('srt')) # libRist -librist_dep = dependency('librist', required : false) +librist_dep = dependency('librist', required: false) # MTP -mtp_dep = dependency('libmtp', version : '>=1.0.0', required : get_option('mtp')) +mtp_dep = dependency('libmtp', version: '>=1.0.0', required: get_option('mtp')) # FFmpeg avformat_dep = dependency('libavformat', version: '>= 53.21.0', required: get_option('avformat')) @@ -138,13 +138,13 @@ avcodec_dep = dependency('libavcodec', version: '>= 57.37.100', required: get_o avutil_dep = dependency('libavutil', version: '>= 55.22.101', required: false) # Freetype, used by text_renderer and ASS access -freetype_dep = dependency('freetype2', required : get_option('freetype')) +freetype_dep = dependency('freetype2', required: get_option('freetype')) # ZVBI, used by Linsys SDI access and VBI/Teletext decoders zvbi_dep = dependency('zvbi-0.2', version: '>= 0.2.28', required: false) # rsvg, used by SVG codec and text renderer -rsvg_dep = dependency('librsvg-2.0', version : '>= 2.9.0', required : get_option('rsvg')) +rsvg_dep = dependency('librsvg-2.0', version: '>= 2.9.0', required: get_option('rsvg')) # Array that holds all enabled VLC module dicts vlc_modules = [] diff --git a/modules/misc/meson.build b/modules/misc/meson.build index 493f06f32f..1d065cb6fd 100644 --- a/modules/misc/meson.build +++ b/modules/misc/meson.build @@ -34,7 +34,7 @@ vlc_modules += { } # libxml2 module -libxml2_dep = dependency('libxml-2.0', version : '>= 2.5', required : get_option('libxml2')) +libxml2_dep = dependency('libxml-2.0', version: '>= 2.5', required: get_option('libxml2')) if libxml2_dep.found() vlc_modules += { 'name' : 'xml', @@ -44,7 +44,7 @@ if libxml2_dep.found() endif # medialibrary module -medialibrary_dep = dependency('medialibrary', required : get_option('medialibrary'), method : 'pkg-config') +medialibrary_dep = dependency('medialibrary', required: get_option('medialibrary'), method: 'pkg-config') if medialibrary_dep.found() vlc_modules += { 'name' : 'medialibrary', @@ -81,7 +81,7 @@ if host_system == 'darwin' endif # GnuTLS module -gnutls_dep = dependency('gnutls', version : '>= 3.5.0', required : get_option('gnutls')) +gnutls_dep = dependency('gnutls', version: '>= 3.5.0', required: get_option('gnutls')) if gnutls_dep.found() gnutls_darwin_deps = [] @@ -135,15 +135,15 @@ if have_wayland # include this file correctly. This needs to be fixed. wl_inhibit_client_proto = custom_target( 'idle-inhibit-client-protocol-generator', - output : 'idle-inhibit-client-protocol.h', - input : wayland_protocols_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', - command : [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], + output: 'idle-inhibit-client-protocol.h', + input: wayland_protocols_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', + command: [wayland_scanner, 'client-header', '@INPUT@', '@OUTPUT@'], ) wl_inhibit_proto = custom_target( 'idle-inhibit-protocol-generator', - output : 'idle-inhibit-protocol.c', - input : wayland_protocols_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', - command : [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], + output: 'idle-inhibit-protocol.c', + input: wayland_protocols_dir / 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml', + command: [wayland_scanner, 'private-code', '@INPUT@', '@OUTPUT@'], ) vlc_modules += { diff --git a/modules/video_chroma/meson.build b/modules/video_chroma/meson.build index 63f47bdc12..3548153fdc 100644 --- a/modules/video_chroma/meson.build +++ b/modules/video_chroma/meson.build @@ -13,7 +13,7 @@ vlc_modules += { 'sources' : files('chain.c') } -swscale_dep = dependency('libswscale', version : '>= 0.5.0', required : get_option('swscale')) +swscale_dep = dependency('libswscale', version: '>= 0.5.0', required: get_option('swscale')) if swscale_dep.found() vlc_modules += { 'name' : 'swscale', diff --git a/modules/video_output/meson.build b/modules/video_output/meson.build index 521079a2f2..045d1905c5 100644 --- a/modules/video_output/meson.build +++ b/modules/video_output/meson.build @@ -70,7 +70,7 @@ vlc_modules += { } # Kernel Mode Setting -drm_dep = dependency('libdrm', version : '>= 2.4.83', required : get_option('drm')) +drm_dep = dependency('libdrm', version: '>= 2.4.83', required: get_option('drm')) if drm_dep.found() vlc_modules += { 'name' : 'kms', @@ -80,7 +80,7 @@ if drm_dep.found() endif # Coloured ASCII art (Caca) -caca_dep = dependency('caca', version : '>= 0.99.beta14', required : get_option('caca')) +caca_dep = dependency('caca', version: '>= 0.99.beta14', required: get_option('caca')) if caca_dep.found() vlc_modules += { 'name' : 'caca', @@ -98,7 +98,7 @@ if xcb_dep.found() vlc_xcb_events_lib = library('vlc_xcb_events', files('xcb/events.c'), include_directories: [vlc_include_dirs], - dependencies : [xcb_dep, libvlccore_dep]) + dependencies: [xcb_dep, libvlccore_dep]) if xcb_randr_dep.found() and xproto_dep.found() vlc_modules += { @@ -133,7 +133,7 @@ if xcb_dep.found() endif endif -egl_dep = dependency('egl', required : false) +egl_dep = dependency('egl', required: false) if x11_dep.found() and egl_dep.found() vlc_modules += { diff --git a/modules/visualization/meson.build b/modules/visualization/meson.build index ae5ee51b46..6467baa01b 100644 --- a/modules/visualization/meson.build +++ b/modules/visualization/meson.build @@ -1,5 +1,5 @@ # goom visualization plugin -goom2_dep = dependency('libgoom2', required : get_option('goom2')) +goom2_dep = dependency('libgoom2', required: get_option('goom2')) if goom2_dep.found() vlc_modules += { 'name' : 'goom', @@ -9,14 +9,14 @@ if goom2_dep.found() endif # projectM visualization plugin -projectm_dep = dependency('libprojectM', version : '>= 2.0.0', required : false) +projectm_dep = dependency('libprojectM', version: '>= 2.0.0', required: false) projectm_args = [] if projectm_dep.found() projectm_args += '-DHAVE_PROJECTM2' else - projectm_dep = dependency('libprojectM', version : '< 2.0.0', - required : false) + projectm_dep = dependency('libprojectM', version: '< 2.0.0', + required: false) endif if projectm_dep.found() diff --git a/src/meson.build b/src/meson.build index 410cdd9f4c..75e3adee0c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -2,12 +2,12 @@ # VLC revision file generation # git_dir = vlc_src_root / '.git' -rev_target = vcs_tag(command : ['git', +rev_target = vcs_tag(command: ['git', '--git-dir', git_dir, 'describe', '--tags', '--long', '--match', '?.*.*', '--always'], - input : 'revision.c.in', - output : 'revision.c') + input: 'revision.c.in', + output: 'revision.c') # # FourCC preprocessor @@ -20,10 +20,10 @@ fourcc_gen = executable('fourcc_gen', ) fourcc = custom_target('fourcc_tables.h', - output : ['fourcc_tables.h'], - depend_files : ['misc/fourcc_list.h', '../include/vlc_fourcc.h'], - capture : true, - command : [fourcc_gen]) + output: ['fourcc_tables.h'], + depend_files: ['misc/fourcc_list.h', '../include/vlc_fourcc.h'], + capture: true, + command: [fourcc_gen]) #