From 6538803cf625aa47ae772630880e613ef7e1450d Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 6 Jun 2024 16:40:32 +0530 Subject: [PATCH] meson: Handle features needed only by examples separately Currently we incorrectly require gtk4 to build the fallbackswitch, livesync, togglerecord plugins when the examples option is allowed. Part-of: --- meson.build | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 58827887..69e3e9ae 100644 --- a/meson.build +++ b/meson.build @@ -312,18 +312,21 @@ if examples_opt.allowed() and 'gtk4' in plugins plugins += { 'fallbackswitch': { 'library': 'libgstfallbackswitch', - 'examples': ['gtk-fallbackswitch'], - 'features': ['gtk', 'gio', 'gst-plugin-gtk4'], + 'examples_features': { + 'gtk-fallbackswitch': ['gtk', 'gio', 'gst-plugin-gtk4'], + }, }, 'livesync': { 'library': 'libgstlivesync', - 'examples': ['gtk-livesync'], - 'features': ['gtk', 'gio', 'gst-plugin-gtk4'], + 'examples_features': { + 'gtk-livesync': ['gtk', 'gio', 'gst-plugin-gtk4'], + } }, 'togglerecord': { 'library': 'libgsttogglerecord', - 'examples': ['gtk-recording'], - 'features': ['gtk', 'gio', 'gst-plugin-gtk4'], + 'examples_features': { + 'gtk-recording': ['gtk', 'gio', 'gst-plugin-gtk4'], + } }, } else @@ -454,6 +457,26 @@ foreach plugin_name, details: plugins examples += example endforeach + plugin_examples_features = details.get('examples_features', {}) + foreach example, examples_features: plugin_examples_features + example_deps_found = true + foreach feature: examples_features + if feature.startswith('gst-plugin') and not packages.contains(feature) + msg = f'@plugin_name@ example @example@ required feature @feature@ not found' + if plugin_opt.enabled() and examples_opt.enabled() + error(msg) + endif + message(msg + ', skipping') + example_deps_found = false + break + endif + endforeach + features += examples_features + if example_deps_found + examples += example + endif + endforeach + packages += f'gst-plugin-@plugin_name@' features += plugin_features extra_features = run_command('dependencies.py', meson.current_source_dir(), plugin_name,