From e09f9e954022668a0fa4ef1ae469d1f57ee37acd Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 22 Feb 2024 12:31:23 -0500 Subject: [PATCH] meson: Fix error when default_library=both Skip duplicated plugin_name when we have both the static and shared plugin in the plugins list. Part-of: --- meson.build | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 7bf90c10..35224b54 100644 --- a/meson.build +++ b/meson.build @@ -489,6 +489,16 @@ foreach plugin : plugins plugin_name = plugin_name.substring(3) endif + plugin_display_name = plugin_name + if plugin_name.startswith('gst') + plugin_display_name = plugin_name.substring(3) + endif + if plugin_display_name in plugin_names + # When default_library=both plugins are duplicated. + continue + endif + plugin_names += plugin_display_name + option_name = plugin_name.substring(3) if option_name.startswith('rs') option_name = option_name.substring(2) @@ -533,13 +543,7 @@ foreach plugin : plugins warning('Static plugin @0@ is known to fail. It will not be included in libgstreamer-full.'.format(plugin_name)) else gst_plugins += dep - pc_files += [plugin_name + '.pc'] - if plugin_name.startswith('gst') - plugin_names += [plugin_name.substring(3)] - else - plugin_names += [plugin_name] - endif endif endforeach