meson: clean up conditional paths after version bump

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1183>
This commit is contained in:
Tim-Philipp Müller 2021-10-18 00:03:47 +01:00 committed by GStreamer Marge Bot
parent c016bed943
commit 531aa4064a
5 changed files with 62 additions and 77 deletions

View file

@ -514,7 +514,7 @@ if have_orcc
] ]
endforeach endforeach
if meson.version().version_compare('>= 0.52') and orc_update_targets.length() > 0 if orc_update_targets.length() > 0
update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets) update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets)
endif endif
endif endif
@ -549,21 +549,16 @@ configure_file(output : 'config.h', configuration : cdata)
subdir('docs') subdir('docs')
if meson.version().version_compare('>= 0.54') plugin_names = []
plugin_names = [] foreach plugin: plugins
foreach plugin: plugins if plugin.name().startswith('gst')
# FIXME: Use str.subtring() when we can depend on Meson 0.56 plugin_names += [plugin.name().substring(3)]
split = plugin.name().split('gst') else
if split.length() == 2 plugin_names += [plugin.name()]
plugin_names += [split[1]] endif
else endforeach
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
plugin_names += [plugin.name()]
endif
endforeach
summary({ summary({
'Plugins': plugin_names, 'Plugins': plugin_names,
'(A)GPL license allowed': gpl_allowed, '(A)GPL license allowed': gpl_allowed,
}, list_sep: ', ') }, list_sep: ', ')
endif

View file

@ -510,7 +510,7 @@ if have_orcc
] ]
endforeach endforeach
if meson.version().version_compare('>= 0.52') if orc_update_targets.length() > 0
update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets) update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets)
endif endif
endif endif
@ -536,17 +536,15 @@ endif
# Use core_conf after all subdirs have set values # Use core_conf after all subdirs have set values
configure_file(output : 'config.h', configuration : core_conf) configure_file(output : 'config.h', configuration : core_conf)
if meson.version().version_compare('>= 0.54') plugin_names = []
plugin_names = [] foreach plugin: plugins
foreach plugin: plugins if plugin.name().startswith('gst')
# FIXME: Use str.subtring() when we can depend on Meson 0.56 plugin_names += [plugin.name().substring(3)]
split = plugin.name().split('gst') else
if split.length() == 2 plugin_names += [plugin.name()]
plugin_names += [split[1]] endif
else endforeach
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
plugin_names += [plugin.name()] summary({
endif 'Plugins': plugin_names,
endforeach }, list_sep: ', ')
summary({'Plugins':plugin_names}, list_sep: ', ')
endif

View file

@ -467,7 +467,7 @@ if have_orcc and orc_targets.length() > 0
] ]
endforeach endforeach
if meson.version().version_compare('>= 0.52') if orc_update_targets.length() > 0
update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets) update_orc_dist_target = alias_target('update-orc-dist', orc_update_targets)
endif endif
endif endif
@ -500,17 +500,15 @@ endif
configure_file(output : 'config.h', configuration : cdata) configure_file(output : 'config.h', configuration : cdata)
if meson.version().version_compare('>= 0.54') plugin_names = []
plugin_names = [] foreach plugin: plugins
foreach plugin: plugins if plugin.name().startswith('gst')
# FIXME: Use str.subtring() when we can depend on Meson 0.56 plugin_names += [plugin.name().substring(3)]
split = plugin.name().split('gst') else
if split.length() == 2 plugin_names += [plugin.name()]
plugin_names += [split[1]] endif
else endforeach
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
plugin_names += [plugin.name()] summary({
endif 'Plugins': plugin_names,
endforeach }, list_sep: ', ')
summary({'Plugins':plugin_names}, list_sep: ', ')
endif

View file

@ -303,20 +303,16 @@ endif
configure_file(output : 'config.h', configuration : cdata) configure_file(output : 'config.h', configuration : cdata)
if meson.version().version_compare('>= 0.54') plugin_names = []
plugin_names = [] foreach plugin: plugins
foreach plugin: plugins if plugin.name().startswith('gst')
# FIXME: Use str.subtring() when we can depend on Meson 0.56 plugin_names += [plugin.name().substring(3)]
split = plugin.name().split('gst') else
if split.length() == 2 plugin_names += [plugin.name()]
plugin_names += [split[1]] endif
else endforeach
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
plugin_names += [plugin.name()] summary({
endif 'Plugins': plugin_names,
endforeach
summary({
'Plugins': plugin_names,
'(A)GPL license allowed': gpl_allowed, '(A)GPL license allowed': gpl_allowed,
}, list_sep: ', ') }, list_sep: ', ')
endif

View file

@ -622,17 +622,15 @@ endif
configure_file(output : 'config.h', configuration : cdata) configure_file(output : 'config.h', configuration : cdata)
install_data('gst-element-check-1.0.m4', install_dir : join_paths(get_option('datadir'), 'aclocal')) install_data('gst-element-check-1.0.m4', install_dir : join_paths(get_option('datadir'), 'aclocal'))
if meson.version().version_compare('>= 0.54') plugin_names = []
plugin_names = [] foreach plugin: plugins
foreach plugin: plugins if plugin.name().startswith('gst')
# FIXME: Use str.subtring() when we can depend on Meson 0.56 plugin_names += [plugin.name().substring(3)]
split = plugin.name().split('gst') else
if split.length() == 2 plugin_names += [plugin.name()]
plugin_names += [split[1]] endif
else endforeach
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
plugin_names += [plugin.name()] summary({
endif 'Plugins': plugin_names,
endforeach }, list_sep: ', ')
summary({'Plugins':plugin_names}, list_sep: ', ')
endif