NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qt: Add optional support for OpenGL

Browse Source 
OpenGL support is only available for the desktop variant of Qt4 and not
the embedded one: http://code.qt.io/cgit/qt/qt.git/tree/configure#n6612

This patch is needed to fix a compile error with libv4l which depends
on OpenGL support if qt4 is used by libv4l as optional dependency.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-06-12 22:07:18 +02:00 committed by Thomas Petazzoni
parent a7487bbc25
commit 1662f7dc58
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
package/qt/Config.in
View File

@ -350,6 +350,24 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
Build the platform Phonon plugin.
If unsure, say n.
choice
prompt "OpenGL API"
help
Select OpenGL API.
config BR2_PACKAGE_QT_OPENGL_NONE
bool "No OpenGL support"
comment "Desktop OpenGL not available (needs Qt standard (X11))"
depends on !BR2_PACKAGE_QT_X11
config BR2_PACKAGE_QT_OPENGL_GL_DESKTOP
bool "Desktop OpenGL"
depends on BR2_PACKAGE_HAS_LIBGL
depends on BR2_PACKAGE_QT_X11
help
Use desktop OpenGL.
config BR2_PACKAGE_QT_OPENGL_ES
bool "OpenGL ES v2.x support"
depends on BR2_PACKAGE_HAS_LIBGLES
@ -357,6 +375,8 @@ config BR2_PACKAGE_QT_OPENGL_ES
help
Enable the OpenGL ES v2.x support.
endchoice
endif
config BR2_PACKAGE_QT_DBUS

3
package/qt/qt.mk
View File

@ -336,6 +336,9 @@ QT_DEPENDENCIES += libgles libegl
QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl`
QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs egl`
else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
QT_CONFIGURE_OPTS += -opengl desktop
QT_DEPENDENCIES += libgl
else
QT_CONFIGURE_OPTS += -no-opengl
endif