diff options
author | Jan Alexander Steffens (heftig) <heftig@archlinux.org> | 2023-07-20 19:13:36 +0200 |
---|---|---|
committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-08-18 12:45:14 +0000 |
commit | d956a7e2d1906b134896ffebdb6b55dbcdcd3153 (patch) | |
tree | 1713f0e8d5996bc0ff4012eb1e23ee51b234eed9 /subprojects/gst-plugins-good | |
parent | 79cf124631b1318407a437957add771fe984e954 (diff) |
qt: Unbreak build with qt-egl enabled but viv_fb missing
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/5200>
Diffstat (limited to 'subprojects/gst-plugins-good')
-rw-r--r-- | subprojects/gst-plugins-good/ext/qt/meson.build | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/subprojects/gst-plugins-good/ext/qt/meson.build b/subprojects/gst-plugins-good/ext/qt/meson.build index 772f52a880..e4fbfb28ca 100644 --- a/subprojects/gst-plugins-good/ext/qt/meson.build +++ b/subprojects/gst-plugins-good/ext/qt/meson.build @@ -113,6 +113,12 @@ if qt5_egl.allowed() qt_defines += ['-DHAVE_QT_EGLFS'] optional_deps += gstglegl_dep 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 # Android windowing @@ -177,17 +183,6 @@ if host_system == 'ios' 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() # rpath is needed to be able to load the plugin on macOS inside the devenv qmlgl_kwargs = {} |