From 531aa4064a6ca4f11558bf27c05e836140748e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 18 Oct 2021 00:03:47 +0100 Subject: [PATCH] meson: clean up conditional paths after version bump Part-of: --- subprojects/gst-plugins-bad/meson.build | 29 ++++++++++-------------- subprojects/gst-plugins-base/meson.build | 28 +++++++++++------------ subprojects/gst-plugins-good/meson.build | 28 +++++++++++------------ subprojects/gst-plugins-ugly/meson.build | 28 ++++++++++------------- subprojects/gstreamer/meson.build | 26 ++++++++++----------- 5 files changed, 62 insertions(+), 77 deletions(-) diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 12ed79146d..381e5b15da 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -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,21 +549,16 @@ 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]] - else - warning('Need substring API in meson >= 0.56 to properly parse plugin name: ' + plugin.name()) - plugin_names += [plugin.name()] - endif - endforeach +plugin_names = [] +foreach plugin: plugins + if plugin.name().startswith('gst') + plugin_names += [plugin.name().substring(3)] + else + plugin_names += [plugin.name()] + endif +endforeach - summary({ - 'Plugins': plugin_names, +summary({ + 'Plugins': plugin_names, '(A)GPL license allowed': gpl_allowed, - }, list_sep: ', ') -endif +}, list_sep: ', ') diff --git a/subprojects/gst-plugins-base/meson.build b/subprojects/gst-plugins-base/meson.build index 88253f1314..c03691c62f 100644 --- a/subprojects/gst-plugins-base/meson.build +++ b/subprojects/gst-plugins-base/meson.build @@ -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]] - 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 +plugin_names = [] +foreach plugin: plugins + if plugin.name().startswith('gst') + plugin_names += [plugin.name().substring(3)] + else + plugin_names += [plugin.name()] + endif +endforeach + +summary({ + 'Plugins': plugin_names, +}, list_sep: ', ') diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index ce32a959c9..1f86364e6c 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -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]] - 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 +plugin_names = [] +foreach plugin: plugins + if plugin.name().startswith('gst') + plugin_names += [plugin.name().substring(3)] + else + plugin_names += [plugin.name()] + endif +endforeach + +summary({ + 'Plugins': plugin_names, +}, list_sep: ', ') diff --git a/subprojects/gst-plugins-ugly/meson.build b/subprojects/gst-plugins-ugly/meson.build index 68bce1fa01..c881ad8b50 100644 --- a/subprojects/gst-plugins-ugly/meson.build +++ b/subprojects/gst-plugins-ugly/meson.build @@ -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]] - 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, +plugin_names = [] +foreach plugin: plugins + if plugin.name().startswith('gst') + plugin_names += [plugin.name().substring(3)] + else + plugin_names += [plugin.name()] + endif +endforeach + +summary({ + 'Plugins': plugin_names, '(A)GPL license allowed': gpl_allowed, - }, list_sep: ', ') -endif +}, list_sep: ', ') diff --git a/subprojects/gstreamer/meson.build b/subprojects/gstreamer/meson.build index f9d675a6fa..c0169bdf74 100644 --- a/subprojects/gstreamer/meson.build +++ b/subprojects/gstreamer/meson.build @@ -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]] - 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 +plugin_names = [] +foreach plugin: plugins + if plugin.name().startswith('gst') + plugin_names += [plugin.name().substring(3)] + else + plugin_names += [plugin.name()] + endif +endforeach + +summary({ + 'Plugins': plugin_names, +}, list_sep: ', ')