From 5ddb347a231d35ea3f4d39ccc527b24250d0fc7e Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 4 Oct 2022 05:39:51 +0100 Subject: [PATCH] build/gl: fix automatic dispmanx detection for rpi4 rpi4 doesn't contain dispmanx but still contains bcm_host.pc which confuses the configure detection. Add an explicit check for EGL_DISPMANX_WINDOW_T to ensure that we only build with dispmanx when the types are available. Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/893 Fixes: https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/952 Part-of: --- subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build index 346ab03..5085545 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build +++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/meson.build @@ -690,7 +690,16 @@ if need_win_x11 != 'no' endif if need_win_dispmanx != 'no' - if bcm_host_dep.found() + have_dispmanx_window_t = cc.has_type( + 'EGL_DISPMANX_WINDOW_T', + prefix: ''' +#include +#include +''', + dependencies: [gl_lib_deps, egl_dep, bcm_host_dep], + include_directories: gl_includes) + + if have_dispmanx_window_t and bcm_host_dep.found() if not egl_dep.found() error('dispmanx requires the use of egl') endif -- 2.7.4