All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL
@ 2016-06-12  9:30 Bernd Kuhls
  2016-06-12  9:30 ` [Buildroot] [PATCH 2/5] package/libv4l: qt4 support depends on OpenGL Bernd Kuhls
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Bernd Kuhls @ 2016-06-12  9:30 UTC (permalink / raw)
  To: buildroot

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>
---
 package/qt/Config.in | 17 +++++++++++++++++
 package/qt/qt.mk     |  3 +++
 2 files changed, 20 insertions(+)

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 0ab8417..4aa5324 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -350,6 +350,21 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 	  Build the platform Phonon plugin.
 	  If unsure, say n.
 
+choice
+	prompt "OpenGL API"
+	help
+	  Select OpenGL API.
+
+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 +372,8 @@ config BR2_PACKAGE_QT_OPENGL_ES
 	help
 	  Enable the OpenGL ES v2.x support.
 
+endchoice
+
 endif
 
 config BR2_PACKAGE_QT_DBUS
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index f29a671..d56fe7e 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -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
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-06-12 19:46 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-12  9:30 [Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL Bernd Kuhls
2016-06-12  9:30 ` [Buildroot] [PATCH 2/5] package/libv4l: qt4 support depends on OpenGL Bernd Kuhls
2016-06-12 19:18   ` Yann E. MORIN
2016-06-12  9:30 ` [Buildroot] [PATCH 3/5] package/libv4l: add optional support for alsa-lib Bernd Kuhls
2016-06-12  9:30 ` [Buildroot] [PATCH 4/5] package/libv4l: add optional support for libgl Bernd Kuhls
2016-06-12  9:30 ` [Buildroot] [PATCH 5/5] package/libv4l: add optional support for libglu Bernd Kuhls
2016-06-12 19:46 ` [Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL Yann E. MORIN

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.