mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-12-23 02:26:35 +00:00
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: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1470>
This commit is contained in:
parent
da21dc853d
commit
e09f9e9540
1 changed files with 10 additions and 6 deletions
16
meson.build
16
meson.build
|
@ -489,6 +489,16 @@ foreach plugin : plugins
|
||||||
plugin_name = plugin_name.substring(3)
|
plugin_name = plugin_name.substring(3)
|
||||||
endif
|
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)
|
option_name = plugin_name.substring(3)
|
||||||
if option_name.startswith('rs')
|
if option_name.startswith('rs')
|
||||||
option_name = option_name.substring(2)
|
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))
|
warning('Static plugin @0@ is known to fail. It will not be included in libgstreamer-full.'.format(plugin_name))
|
||||||
else
|
else
|
||||||
gst_plugins += dep
|
gst_plugins += dep
|
||||||
|
|
||||||
pc_files += [plugin_name + '.pc']
|
pc_files += [plugin_name + '.pc']
|
||||||
if plugin_name.startswith('gst')
|
|
||||||
plugin_names += [plugin_name.substring(3)]
|
|
||||||
else
|
|
||||||
plugin_names += [plugin_name]
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue