[Buildroot] [PATCH 1/2] qt5declarative: Reduce dependencies to GLes2 only
Jérôme Pouiller
jezz at sysmic.org
Tue Apr 1 16:16:11 UTC 2014
From: Jérôme Pouiller <j.pouiller at sysmic.fr>
Signed-off-by: Jérôme Pouiller <jezz at sysmic.org>
---
package/qt5/qt5base/qt5base.mk | 12 +++++++++---
package/qt5/qt5declarative/Config.in | 1 -
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 618251e..b99733a 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -96,9 +96,15 @@ else
QT5BASE_CONFIGURE_OPTS += -no-xcb
endif
-ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
-QT5BASE_CONFIGURE_OPTS += -opengl es2 -eglfs
+ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL)$(BR2_PACKAGE_HAS_OPENGL_ES),yy)
+QT5BASE_CONFIGURE_OPTS += -opengl es2
QT5BASE_DEPENDENCIES += libgles libegl
+else
+QT5BASE_CONFIGURE_OPTS += -no-opengl
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y)
+QT5BASE_CONFIGURE_OPTS += -eglfs
ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y)
QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
$(@D)/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp
@@ -108,7 +114,7 @@ QT5BASE_EGLFS_PLATFORM_HOOKS_SOURCES = \
$(@D)/mkspecs/devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp
endif
else
-QT5BASE_CONFIGURE_OPTS += -no-opengl -no-eglfs
+QT5BASE_CONFIGURE_OPTS += -no-eglfs
endif
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index c5753b1..7f25999 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_QT5DECLARATIVE
select BR2_PACKAGE_QT5XMLPATTERNS
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_GUI
- select BR2_PACKAGE_QT5BASE_EGLFS
depends on BR2_PACKAGE_HAS_OPENGL_EGL
depends on BR2_PACKAGE_HAS_OPENGL_ES
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
--
1.9.1
More information about the buildroot
mailing list