From e4d5cece28a60a170112b065cc6077065fe9ef12 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 21 May 2025 20:29:06 +0530 Subject: [PATCH] meson: Add a monorepo-wide qt-method option and yield to it Part-of: --- meson.options | 2 ++ subprojects/gst-plugins-bad/meson.options | 2 +- subprojects/gst-plugins-base/meson.options | 2 +- subprojects/gst-plugins-good/meson.options | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.options b/meson.options index d73d9cce34..5a7191771c 100644 --- a/meson.options +++ b/meson.options @@ -61,6 +61,8 @@ option('extra-checks', type : 'feature', value : 'enabled', description : 'Enabl option('benchmarks', type : 'feature', value : 'auto') option('tools', type : 'feature', value : 'auto', yield : true, description : 'Build command line tools') option('orc', type : 'feature', value : 'auto', description : 'Optimized Inner Loop Runtime Compiler (SIMD)') +option('qt-method', type: 'combo', value: 'auto', choices: ['auto', 'pkg-config', 'qmake'], + description: 'Method to use to find Qt') option('qt5', type : 'feature', value : 'auto', description : 'Qt5 toolkit support') option('qt6', type : 'feature', value : 'auto', description : 'Qt6 toolkit support') option('webrtc', type : 'feature', value : 'auto', description : 'WebRTC support') diff --git a/subprojects/gst-plugins-bad/meson.options b/subprojects/gst-plugins-bad/meson.options index be876b70c4..91b57616d3 100644 --- a/subprojects/gst-plugins-bad/meson.options +++ b/subprojects/gst-plugins-bad/meson.options @@ -268,7 +268,7 @@ option('mfx-modules-dir', type: 'string', value : '', # Qt6 plugin options option('qt6d3d11', type : 'feature', value : 'auto', description : 'Qt6 Direct3D11 plugin') option('qt-method', type: 'combo', value: 'auto', choices: ['auto', 'pkg-config', 'qmake'], - description: 'Method to use to find Qt') + yield: true, description: 'Method to use to find Qt') # Vulkan integration library and plugin options option('vulkan', type: 'feature', value: 'auto', description: 'Vulkan integration library and video sink plugin') diff --git a/subprojects/gst-plugins-base/meson.options b/subprojects/gst-plugins-base/meson.options index 3143ac76c5..be2dda2966 100644 --- a/subprojects/gst-plugins-base/meson.options +++ b/subprojects/gst-plugins-base/meson.options @@ -79,7 +79,7 @@ option('orc', type : 'feature', value : 'auto', yield : true) # Qt tests options option('qt-method', type: 'combo', value: 'auto', choices: ['auto', 'pkg-config', 'qmake'], - description: 'Method to use to find Qt') + yield: true, description: 'Method to use to find Qt') option('qt5', type : 'feature', value : 'auto', yield : true, description : 'Qt5 QML examples') # Common options diff --git a/subprojects/gst-plugins-good/meson.options b/subprojects/gst-plugins-good/meson.options index c110e30cfa..96eb7285ff 100644 --- a/subprojects/gst-plugins-good/meson.options +++ b/subprojects/gst-plugins-good/meson.options @@ -94,7 +94,7 @@ option('soup-version', type : 'combo', value : 'auto', choices : ['auto', '2', ' # Qt plugin options option('qt-method', type: 'combo', value: 'auto', choices: ['auto', 'pkg-config', 'qmake'], - description: 'Method to use to find Qt') + yield: true, description: 'Method to use to find Qt') option('qt-egl', type: 'feature', value: 'auto', description: 'EGLFS support in the Qt plugins') option('qt-wayland', type: 'feature', value: 'auto', description: 'Wayland support in the Qt plugins') option('qt-x11', type: 'feature', value: 'auto', description: 'X11 support in the Qt plugins')