mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-29 21:21:12 +00:00
meson: clean up conditional paths after version bump
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1183>
This commit is contained in:
parent
c016bed943
commit
531aa4064a
5 changed files with 62 additions and 77 deletions
|
@ -514,7 +514,7 @@ if have_orcc
|
|||
]
|
||||
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)
|
||||
endif
|
||||
endif
|
||||
|
@ -549,15 +549,11 @@ configure_file(output : 'config.h', configuration : cdata)
|
|||
|
||||
subdir('docs')
|
||||
|
||||
if meson.version().version_compare('>= 0.54')
|
||||
plugin_names = []
|
||||
foreach plugin: plugins
|
||||
# FIXME: Use str.subtring() when we can depend on Meson 0.56
|
||||
split = plugin.name().split('gst')
|
||||
if split.length() == 2
|
||||
plugin_names += [split[1]]
|
||||
if plugin.name().startswith('gst')
|
||||
plugin_names += [plugin.name().substring(3)]
|
||||
else
|
||||
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
|
||||
plugin_names += [plugin.name()]
|
||||
endif
|
||||
endforeach
|
||||
|
@ -566,4 +562,3 @@ if meson.version().version_compare('>= 0.54')
|
|||
'Plugins': plugin_names,
|
||||
'(A)GPL license allowed': gpl_allowed,
|
||||
}, list_sep: ', ')
|
||||
endif
|
||||
|
|
|
@ -510,7 +510,7 @@ if have_orcc
|
|||
]
|
||||
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)
|
||||
endif
|
||||
endif
|
||||
|
@ -536,17 +536,15 @@ endif
|
|||
# Use core_conf after all subdirs have set values
|
||||
configure_file(output : 'config.h', configuration : core_conf)
|
||||
|
||||
if meson.version().version_compare('>= 0.54')
|
||||
plugin_names = []
|
||||
foreach plugin: plugins
|
||||
# FIXME: Use str.subtring() when we can depend on Meson 0.56
|
||||
split = plugin.name().split('gst')
|
||||
if split.length() == 2
|
||||
plugin_names += [split[1]]
|
||||
if plugin.name().startswith('gst')
|
||||
plugin_names += [plugin.name().substring(3)]
|
||||
else
|
||||
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
|
||||
plugin_names += [plugin.name()]
|
||||
endif
|
||||
endforeach
|
||||
summary({'Plugins':plugin_names}, list_sep: ', ')
|
||||
endif
|
||||
|
||||
summary({
|
||||
'Plugins': plugin_names,
|
||||
}, list_sep: ', ')
|
||||
|
|
|
@ -467,7 +467,7 @@ if have_orcc and orc_targets.length() > 0
|
|||
]
|
||||
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)
|
||||
endif
|
||||
endif
|
||||
|
@ -500,17 +500,15 @@ endif
|
|||
|
||||
configure_file(output : 'config.h', configuration : cdata)
|
||||
|
||||
if meson.version().version_compare('>= 0.54')
|
||||
plugin_names = []
|
||||
foreach plugin: plugins
|
||||
# FIXME: Use str.subtring() when we can depend on Meson 0.56
|
||||
split = plugin.name().split('gst')
|
||||
if split.length() == 2
|
||||
plugin_names += [split[1]]
|
||||
if plugin.name().startswith('gst')
|
||||
plugin_names += [plugin.name().substring(3)]
|
||||
else
|
||||
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
|
||||
plugin_names += [plugin.name()]
|
||||
endif
|
||||
endforeach
|
||||
summary({'Plugins':plugin_names}, list_sep: ', ')
|
||||
endif
|
||||
|
||||
summary({
|
||||
'Plugins': plugin_names,
|
||||
}, list_sep: ', ')
|
||||
|
|
|
@ -303,20 +303,16 @@ endif
|
|||
|
||||
configure_file(output : 'config.h', configuration : cdata)
|
||||
|
||||
if meson.version().version_compare('>= 0.54')
|
||||
plugin_names = []
|
||||
foreach plugin: plugins
|
||||
# FIXME: Use str.subtring() when we can depend on Meson 0.56
|
||||
split = plugin.name().split('gst')
|
||||
if split.length() == 2
|
||||
plugin_names += [split[1]]
|
||||
if plugin.name().startswith('gst')
|
||||
plugin_names += [plugin.name().substring(3)]
|
||||
else
|
||||
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
|
||||
plugin_names += [plugin.name()]
|
||||
endif
|
||||
endforeach
|
||||
|
||||
summary({
|
||||
'Plugins': plugin_names,
|
||||
'(A)GPL license allowed': gpl_allowed,
|
||||
}, list_sep: ', ')
|
||||
endif
|
||||
|
|
|
@ -622,17 +622,15 @@ endif
|
|||
configure_file(output : 'config.h', configuration : cdata)
|
||||
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 = []
|
||||
foreach plugin: plugins
|
||||
# FIXME: Use str.subtring() when we can depend on Meson 0.56
|
||||
split = plugin.name().split('gst')
|
||||
if split.length() == 2
|
||||
plugin_names += [split[1]]
|
||||
if plugin.name().startswith('gst')
|
||||
plugin_names += [plugin.name().substring(3)]
|
||||
else
|
||||
warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name())
|
||||
plugin_names += [plugin.name()]
|
||||
endif
|
||||
endforeach
|
||||
summary({'Plugins':plugin_names}, list_sep: ', ')
|
||||
endif
|
||||
|
||||
summary({
|
||||
'Plugins': plugin_names,
|
||||
}, list_sep: ', ')
|
||||
|
|
Loading…
Reference in a new issue