7e9f459adf
Fix "Unable to find an X11 visual" bug that produce at runtime with Vivante drivers. Add a conditionnal patch and add variable QT5BASE_EXTRA_CFLAGS in order to enable workaround. This patch is actually an improvement over the fix available in Yocto: https://github.com/Freescale/meta-fsl-arm/blob/dizzy/qt5-layer/recipes-qt/qt5/qtbase/Force_egl_visual_ID_33.patch [Thomas: - Add SoB from Jérôme Pouiller inside the patch imported from Yocto. - Add a space between $(TARGET_CFLAGS) and $(QT5BASE_EXTRA_CFLAGS), and ditto for CXXFLAGS. - Merge the QT5BASE_EXTRA_CFLAGS into an existing BR2_PACKAGE_GPU_VIV_BIN_MX6Q conditional.] Tested-by: Gary Bisson <gary.bisson@boundarydevices.com> Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com> Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
Workaround EGL initialization failure due visual mismatch
|
|
|
|
Error:
|
|
|
|
Warning: EGL suggested using X Visual ID 33 (RGB888) for EGL config 28 (RGB444), but this is incompatable
|
|
Unable to find an X11 visual which matches EGL config 28
|
|
Could not initialize EGL
|
|
Aborted
|
|
|
|
Upstream-Status: Inappropriate [workaround]
|
|
|
|
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
|
|
Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
|
|
|
|
diff -Naur qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp
|
|
--- qtbase-opensource-src-5.1.1_original/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:08:42.163895341 -0800
|
|
+++ qtbase-opensource-src-5.1.1/src/platformsupport/eglconvenience/qxlibeglintegration.cpp 2013-12-25 19:09:37.207893799 -0800
|
|
@@ -180,5 +180,9 @@
|
|
}
|
|
|
|
qWarning("Unable to find an X11 visual which matches EGL config %d", configId);
|
|
+#ifdef ENABLE_MX6_WORKAROUND
|
|
+ return (VisualID)33;
|
|
+#else
|
|
return (VisualID)0;
|
|
+#endif
|
|
}
|