mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 14:11:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt: Unbreak build with qt-egl enabled but viv_fb missing

Browse source 
Avoids an error message when the feature is explicitly enabled:

    ERROR: Feature qt-egl cannot be enabled: gstreamer-gl-viv_fb-1.0 is required

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083>
This commit is contained in:
Jan Alexander Steffens (heftig) 2023-07-20 19:13:36 +02:00 committed by GStreamer Marge Bot
parent 09045da073
commit 314ffa3fb5
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
subprojects/gst-plugins-good/ext/qt/meson.build
View file

@ -112,6 +112,12 @@ if qt5_egl.allowed()
qt_defines += ['-DHAVE_QT_EGLFS'] qt_defines += ['-DHAVE_QT_EGLFS']
optional_deps += gstglegl_dep optional_deps += gstglegl_dep
have_qt_windowing = true have_qt_windowing = true
# EGL windowing for Vivante Framebuffer (e.g. i.MX6)
if gstglviv_fb_dep.found()
qt_defines += ['-DHAVE_QT_VIV_FB']
optional_deps += gstglviv_fb_dep
endif
endif endif
# Android windowing # Android windowing
@ -173,17 +179,6 @@ if host_system == 'ios'
endif endif
endif endif
# EGL windowing for Vivante Framebuffer (e.g. i.MX6)
qt5_viv_fb = qt5_egl \
.require(host_system == 'linux') \
.require(gstglviv_fb_dep.found(), error_message: 'gstreamer-gl-viv_fb-1.0 is required') \
.require(gst_gl_have_platform_egl, error_message: 'egl platform support in gstreamer-gl is required')
if qt5_viv_fb.allowed()
qt_defines += ['-DHAVE_QT_VIV_FB']
optional_deps += gstglviv_fb_dep
have_qt_windowing = true
endif
if qt5_option.require(have_qt_windowing).allowed() if qt5_option.require(have_qt_windowing).allowed()
# rpath is needed to be able to load the plugin on macOS inside the devenv # rpath is needed to be able to load the plugin on macOS inside the devenv
qmlgl_kwargs = {} qmlgl_kwargs = {}