Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (3)
Showing
with 160 additions and 160 deletions
......@@ -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')
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.
......@@ -232,7 +232,7 @@ check_headers = [
['dcomp.h'],
['wordexp.h'],
['GL/wglew.h',
{ 'prefix': ['#include <windows.h>', '#include <GL/glew.h>'],
{ 'prefix' : ['#include <windows.h>', '#include <GL/glew.h>'],
'args' : [contrib_inc_args] }],
]
......@@ -256,11 +256,11 @@ if host_system == 'darwin'
# Check if compiling for iOS
have_ios = cc.get_define('TARGET_OS_IPHONE',
prefix : '#include <TargetConditionals.h>') == '1'
prefix: '#include <TargetConditionals.h>') == '1'
# Check if compiling for tvOS
have_tvos = cc.get_define('TARGET_OS_TV',
prefix : '#include <TargetConditionals.h>') == '1'
prefix: '#include <TargetConditionals.h>') == '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-<anything> 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 <net/if.h>')
if cc.has_function('if_nameindex', prefix: '#include <net/if.h>')
cdata.set('HAVE_IF_NAMEINDEX', 1)
endif
if cc.has_type('struct if_nameindex', prefix : '#include <net/if.h>')
if cc.has_type('struct if_nameindex', prefix: '#include <net/if.h>')
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 <locale>')
if cpp.has_type('locale_t', prefix: '#include <locale>')
cdata.set('HAVE_CXX_LOCALE_T', 1)
endif
......
......@@ -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)
#
......
......@@ -168,7 +168,7 @@ endif
vlc_modules += {
'name' : 'shm',
'sources' : files('shm.c'),
'dependencies': [m_lib]
'dependencies' : [m_lib]
}
......@@ -180,7 +180,7 @@ subdir('screen')
freerdp_dep = dependency('freerdp', required: get_option('freerdp'))
if freerdp_dep.found()
vlc_modules += {
'name': 'rdp',
'name' : 'rdp',
'sources' : files('rdp.c'),
'dependencies' : [freerdp_dep]
}
......@@ -191,7 +191,7 @@ vncclient_dep = dependency('libvncclient', required: get_option('vnc'))
if vncclient_dep.found()
vlc_modules += {
'name' : 'vnc',
'sources': files('vnc.c'),
'sources' : files('vnc.c'),
'dependencies' : [vncclient_dep]
}
endif
......@@ -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
......@@ -415,7 +415,7 @@ vlc_modules += {
## Misc
vlc_modules += {
'name': 'access_concat',
'name' : 'access_concat',
'sources' : files('concat.c')
}
......
......@@ -32,8 +32,8 @@ if get_option('screen').allowed()
vlc_modules += {
'name' : 'screen',
'sources' : screen_files,
'dependencies': screen_deps,
'link_with': screen_link_with,
'dependencies' : screen_deps,
'link_with' : screen_link_with,
}
endif
endif
......@@ -3,19 +3,19 @@
# Dummy
vlc_modules += {
'name' : 'access_output_dummy',
'sources': files('dummy.c')
'sources' : files('dummy.c')
}
# File
vlc_modules += {
'name' : 'access_output_file',
'sources': files('file.c')
'sources' : files('file.c')
}
# HTTP
vlc_modules += {
'name' : 'access_output_http',
'sources': files('http.c')
'sources' : files('http.c')
}
# TODO: Add HAVE_GCRYPT + livehttp
......
......@@ -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',
......
......@@ -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',
......@@ -57,7 +57,7 @@ vlc_modules += {
# Raw PCM demux module
vlc_modules += {
'name' : 'araw',
'sources' : files(['araw.c']),
'sources' : files('araw.c'),
}
# faad decoder plugin
......@@ -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')
],
......
......@@ -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',
......
......@@ -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 += {
......@@ -69,7 +69,7 @@ vlc_modules += {
# WAV demux module
vlc_modules += {
'name' : 'wav',
'sources' : files(['wav.c']),
'sources' : files('wav.c'),
}
# NSV demux
......@@ -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',
......@@ -122,7 +122,7 @@ vlc_modules += {
# Subtitle demux
vlc_modules += {
'name' : 'subtitle',
'sources' : files(['subtitle.c']),
'sources' : files('subtitle.c'),
'dependencies' : [m_lib]
}
......@@ -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()
......@@ -574,7 +574,7 @@ vlc_modules += {
),
'include_directories' : include_directories('adaptive', './'),
'dependencies' : [socket_libs, m_lib, z_lib],
'link_with': vlc_http_lib,
'link_with' : vlc_http_lib,
# TODO: Add optional GCRYPT dependency!
}
......
......@@ -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')
......
# Console logger module
vlc_modules += {
'name' : 'console_logger',
'sources' : files(['console.c']),
'sources' : files('console.c'),
}
# File logger
......@@ -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',
......
......@@ -59,8 +59,8 @@ if lua_dep.found() and get_option('lua').enabled()
endif
vlc_modules += {
'name': 'lua',
'sources': lua_sources,
'dependencies': [lua_dep, socket_libs]
'name' : 'lua',
'sources' : lua_sources,
'dependencies' : [lua_dep, socket_libs]
}
endif
......@@ -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 = []
......
......@@ -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 += {
......
......@@ -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',
......
......@@ -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,13 +133,13 @@ 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 += {
'name' : 'egl_x11',
'sources' : files('opengl/egl.c'),
'c_args': ['-DUSE_PLATFORM_X11=1'],
'c_args' : ['-DUSE_PLATFORM_X11=1'],
'dependencies' : [egl_dep, x11_dep]
}
endif
......@@ -148,6 +148,6 @@ if x11_dep.found() and opengl_dep.found()
vlc_modules += {
'name' : 'glx',
'sources' : files('glx.c'),
'dependencies': [x11_dep, opengl_dep]
'dependencies' : [x11_dep, opengl_dep]
}
endif
# 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()
......
......@@ -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])
#
......