mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: replace join_paths(a, b) with a / b

Browse source 
More readable and from the meson reference manual:
(since 0.49.0) Using the/ operator on strings is equivalent to calling join_paths.
This commit is contained in:
Peter Hutterer 2021-04-15 14:41:04 +10:00 • committed by Wim Taymans
parent 2f78829fda
commit 223f20709d
34 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/alsa/meson.build
View file

@ -19,7 +19,7 @@ spa_alsa = shared_library(
dependencies : [ alsa_dep, libudev_dep, mathlib ],
link_with : [ acp_lib ],
install : true,
install_dir : join_paths(spa_plugindir, 'alsa')
install_dir : spa_plugindir / 'alsa'
)
alsa_udevrules = [

18
spa/plugins/audioconvert/meson.build
View file

@ -111,7 +111,7 @@ audioconvertlib = shared_library('spa-audioconvert',
dependencies : [ mathlib ],
link_with : audioconvert,
install : true,
install_dir : join_paths(spa_plugindir, 'audioconvert'))
install_dir : spa_plugindir / 'audioconvert')
test_lib = static_library('test_lib',
['test-source.c' ],
@ -134,10 +134,10 @@ foreach a : test_apps
dependencies : [dl_lib, pthread_lib, mathlib ],
include_directories : [ configinc, spa_inc ],
link_with : [ audioconvert, test_lib, audioconvertlib ],
install_rpath : join_paths(spa_plugindir, 'audioconvert'),
install_rpath : spa_plugindir / 'audioconvert',
c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'audioconvert')),
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
])
@ -145,11 +145,11 @@ foreach a : test_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec',
join_paths(installed_tests_execdir, 'audioconvert', a))
installed_tests_execdir / 'audioconvert' / a)
configure_file(
input: installed_tests_template,
output: a + '.test',
install_dir: join_paths(installed_tests_metadir, 'audioconvert'),
install_dir: installed_tests_metadir / 'audioconvert',
configuration: test_conf
)
endif
@ -167,9 +167,9 @@ foreach a : benchmark_apps
include_directories : [ configinc, spa_inc ],
c_args : [ simd_cargs, '-D_GNU_SOURCE' ],
link_with : [ audioconvert, audioconvertlib ],
install_rpath : join_paths(spa_plugindir, 'audioconvert'),
install_rpath : spa_plugindir / 'audioconvert',
install : installed_tests_enabled,
install_dir : join_paths(installed_tests_execdir, 'audioconvert')),
install_dir : installed_tests_execdir / 'audioconvert'),
env : [
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
])
@ -177,11 +177,11 @@ foreach a : benchmark_apps
if installed_tests_enabled
test_conf = configuration_data()
test_conf.set('exec',
join_paths(installed_tests_execdir, 'audioconvert', a))
installed_tests_execdir / 'audioconvert' / a)
configure_file(
input: installed_tests_template,
output: a + '.test',
install_dir: join_paths(installed_tests_metadir, 'audioconvert'),
install_dir: installed_tests_metadir / 'audioconvert',
configuration: test_conf
)
endif

2
spa/plugins/audiomixer/meson.build
View file

@ -53,4 +53,4 @@ audiomixerlib = shared_library('spa-audiomixer',
include_directories : [spa_inc],
dependencies : [ mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'audiomixer'))
install_dir : spa_plugindir / 'audiomixer')

2
spa/plugins/audiotestsrc/meson.build
View file

@ -5,4 +5,4 @@ audiotestsrclib = shared_library('spa-audiotestsrc',
include_directories : [spa_inc],
dependencies : [mathlib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'audiotestsrc'))
install_dir : spa_plugindir / 'audiotestsrc')

2
spa/plugins/bluez5/meson.build
View file

@ -71,4 +71,4 @@ bluez5lib = shared_library('spa-bluez5',
c_args : bluez5_args,
dependencies : bluez5_deps,
install : true,
install_dir : join_paths(spa_plugindir, 'bluez5'))
install_dir : spa_plugindir / 'bluez5')

2
spa/plugins/control/meson.build
View file

@ -6,4 +6,4 @@ controllib = shared_library('spa-control',
include_directories : [spa_inc],
dependencies : [ mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'control'))
install_dir : spa_plugindir / 'control')

2
spa/plugins/ffmpeg/meson.build
View file

@ -7,4 +7,4 @@ ffmpeglib = shared_library('spa-ffmpeg',
include_directories : [spa_inc],
dependencies : [ avcodec_dep, avformat_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'ffmpeg'))
install_dir : spa_plugindir / 'ffmpeg')

2
spa/plugins/jack/meson.build
View file

@ -9,4 +9,4 @@ spa_jack = shared_library('spa-jack',
include_directories : [spa_inc],
dependencies : [ jack_dep, mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'jack'))
install_dir : spa_plugindir / 'jack')

2
spa/plugins/libcamera/meson.build
View file

@ -12,5 +12,5 @@ libcameralib = shared_library('spa-libcamera',
include_directories : [ spa_inc ],
dependencies : [ libudev_dep, libcamera_dep, pthread_lib, libdrm_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'libcamera'))
install_dir : spa_plugindir / 'libcamera')
endif

8
spa/plugins/support/meson.build
View file

@ -12,7 +12,7 @@ spa_support_lib = shared_library('spa-support',
include_directories : [ spa_inc ],
dependencies : [ pthread_lib, epoll_shim_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
if not get_option('evl').disabled()
@ -29,7 +29,7 @@ if not get_option('evl').disabled()
include_directories : [ spa_inc, evl_inc],
dependencies : [ pthread_lib, evl_lib],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
endif
spa_dbus_sources = ['dbus.c']
@ -39,7 +39,7 @@ spa_dbus_lib = shared_library('spa-dbus',
include_directories : [ spa_inc],
dependencies : [dbus_dep, ],
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
if systemd_dep.found()
@ -50,5 +50,5 @@ if systemd_dep.found()
include_directories : spa_inc,
dependencies : systemd_dep,
install : true,
install_dir : join_paths(spa_plugindir, 'support'))
install_dir : spa_plugindir / 'support')
endif

2
spa/plugins/test/meson.build
View file

@ -5,4 +5,4 @@ testlib = shared_library('spa-test',
include_directories : [ spa_inc],
dependencies : [pthread_lib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'test'))
install_dir : spa_plugindir / 'test')

2
spa/plugins/v4l2/meson.build
View file

@ -8,4 +8,4 @@ v4l2lib = shared_library('spa-v4l2',
include_directories : [ spa_inc ],
dependencies : [ libudev_dep, libinotify_dep ],
install : true,
install_dir : join_paths(spa_plugindir, 'v4l2'))
install_dir : spa_plugindir / 'v4l2')

2
spa/plugins/videoconvert/meson.build
View file

@ -11,4 +11,4 @@ videoconvertlib = shared_library('spa-videoconvert',
dependencies : [ mathlib ],
link_with : simd_dependencies,
install : true,
install_dir : join_paths(spa_plugindir, 'videoconvert'))
install_dir : spa_plugindir / 'videoconvert')

2
spa/plugins/videotestsrc/meson.build
View file

@ -5,4 +5,4 @@ videotestsrclib = shared_library('spa-videotestsrc',
include_directories : [ spa_inc],
dependencies : [pthread_lib, ],
install : true,
install_dir : join_paths(spa_plugindir, 'videotestsrc'))
install_dir : spa_plugindir / 'videotestsrc')

2
spa/plugins/volume/meson.build
View file

@ -4,4 +4,4 @@ volumelib = shared_library('spa-volume',
volume_sources,
include_directories : [spa_inc],
install : true,
install_dir : join_paths(spa_plugindir, 'volume'))
install_dir : spa_plugindir / 'volume')

2
spa/plugins/vulkan/meson.build
View file

@ -7,4 +7,4 @@ spa_vulkan = shared_library('spa-vulkan',
include_directories : [spa_inc],
dependencies : [ vulkan_dep, mathlib ],
install : true,
install_dir : join_paths(spa_plugindir, 'vulkan'))
install_dir : spa_plugindir / 'vulkan')