mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-05-20 01:08:06 +00:00
Code Issues Projects Releases Wiki Activity

meson: Fix build of static plugins

Browse source 
While we were correctly skipping the plugins that couldn't be
built statically, we were still adding their names to the list
and the .pc list causing them to still get built.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/994>
This commit is contained in:
Jordan Petridis 2022-11-29 18:48:03 +02:00
parent 76eeaffbb2
commit 12c058bc49
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci/generate-static-test.py
View file

@ -7,7 +7,7 @@ import os
from utils import iterate_plugins from utils import iterate_plugins
# the csound version used on ci does not ship a .pc file # the csound version used on ci does not ship a .pc file
IGNORE = ['csound'] IGNORE = ['csound', 'threadshare']
outdir = sys.argv[1] outdir = sys.argv[1]

12
meson.build
View file

@ -282,13 +282,13 @@ 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
endif
pc_files += [plugin_name + '.pc'] pc_files += [plugin_name + '.pc']
if plugin_name.startswith('gst') if plugin_name.startswith('gst')
plugin_names += [plugin_name.substring(3)] plugin_names += [plugin_name.substring(3)]
else else
plugin_names += [plugin_name] plugin_names += [plugin_name]
endif
endif endif
endforeach endforeach