mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

build/qt6: properly error/skip build if the qsb tool is not found

Browse source 
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3032

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5459>
This commit is contained in:
Matthew Waters 2023-10-12 00:27:11 +11:00 committed by GStreamer Marge Bot
parent ed29c23e86
commit 7b491f382c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-good/ext/qt6/meson.build
View file

@ -60,6 +60,11 @@ if not qt6qml_dep.found()
subdir_done() subdir_done()
endif endif
qsb = find_program('qsb-qt6', 'qsb', required: qt6_option)
if not qsb.found()
subdir_done()
endif
optional_deps = [] optional_deps = []
qt_defines = [] qt_defines = []
have_qpa_include = false have_qpa_include = false
@ -159,7 +164,6 @@ if qt6_option.require(have_qt_windowing).allowed()
# Build it! # Build it!
moc_files = qt6_mod.preprocess(moc_headers : moc_headers, method: qt6_method) moc_files = qt6_mod.preprocess(moc_headers : moc_headers, method: qt6_method)
# TODO: dist backup qsb shaders? # TODO: dist backup qsb shaders?
qsb = find_program('qsb-qt6', 'qsb')
shaders = [] shaders = []
foreach shader: shader_sources foreach shader: shader_sources
qsb_shader = shader + '.qsb' qsb_shader = shader + '.qsb'