From ad53b303e75691c5e85462cc7f7a2116b547bddf Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Pouiller?= Date: Tue, 28 Jul 2015 11:06:25 +0200 Subject: [PATCH] qt5base: fix activation of i.MX visual ID workaround MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The workaround implemented in 0001-Force_egl_visual_ID_33.patch has to be enabled as soon as gpu_vivante/xorg is used. This does not depends on eglfs option. [Thomas: minor commit log tweaks.] Signed-off-by: Jérôme Pouiller Signed-off-by: Thomas Petazzoni --- package/qt5/qt5base/qt5base.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 6f0f5267a7..753b0696f5 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -118,12 +118,13 @@ endif QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) -ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) -QT5BASE_CONFIGURE_OPTS += -eglfs -QT5BASE_DEPENDENCIES += libegl ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) QT5BASE_EXTRA_CFLAGS = -DENABLE_MX6_WORKAROUND endif + +ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) +QT5BASE_CONFIGURE_OPTS += -eglfs +QT5BASE_DEPENDENCIES += libegl else QT5BASE_CONFIGURE_OPTS += -no-eglfs endif -- 2.30.2