[Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL

[Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL

[Bernd Kuhls]

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

[Buildroot] [PATCH 2/5] package/libv4l: qt4 support depends on OpenGL

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/8fc/8fc8cbc85dacebce5cb6ab13f5ff3b0764117471/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libv4l/libv4l.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index bdd28bf..d0a0369 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -54,7 +54,7 @@ LIBV4L_CONF_ENV += \
 	ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \
 	ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \
 	ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
-else ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
+else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
 LIBV4L_CONF_OPTS += --enable-qv4l2
 LIBV4L_DEPENDENCIES += qt
 else
-- 
2.8.1

[Buildroot] [PATCH 3/5] package/libv4l: add optional support for alsa-lib

[Bernd Kuhls]

Add alsa-lib as optional dependency to get a reproducable build.
Without this patch configure logs:

checking for ALSA... no
configure: WARNING: ALSA library not available

After this patch alsa-lib was built before libv4l:
checking for ALSA... yes

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libv4l/libv4l.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index d0a0369..e7a57f0 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -18,6 +18,10 @@ LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries)
 LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+LIBV4L_DEPENDENCIES += alsa-lib
+endif
+
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 LIBV4L_DEPENDENCIES += argp-standalone
 LIBV4L_LIBS += -largp
-- 
2.8.1

[Buildroot] [PATCH 4/5] package/libv4l: add optional support for libgl

[Bernd Kuhls]

libv4l has optional support for OpenGL:
https://git.linuxtv.org/v4l-utils.git/tree/configure.ac#n160

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libv4l/libv4l.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index e7a57f0..a73b6cf 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -36,6 +36,10 @@ else
 LIBV4L_CONF_OPTS += --without-jpeg
 endif
 
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
+LIBV4L_DEPENDENCIES += libgl
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIBV4L_CONF_OPTS += --with-libudev
 LIBV4L_DEPENDENCIES += udev
-- 
2.8.1

[Buildroot] [PATCH 5/5] package/libv4l: add optional support for libglu

[Bernd Kuhls]

libv4l has optional support for libglu:
https://git.linuxtv.org/v4l-utils.git/tree/configure.ac#n166

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/libv4l/libv4l.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
index a73b6cf..d0a3f2b 100644
--- a/package/libv4l/libv4l.mk
+++ b/package/libv4l/libv4l.mk
@@ -47,6 +47,10 @@ else
 LIBV4L_CONF_OPTS += --without-libudev
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGLU),y)
+LIBV4L_DEPENDENCIES += libglu
+endif
+
 ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
 LIBV4L_CONF_OPTS += --enable-v4l-utils
 # clock_gettime is used, which is provided by librt for glibc < 2.17
-- 
2.8.1

[Buildroot] [PATCH 2/5] package/libv4l: qt4 support depends on OpenGL

[Yann E. MORIN]

Bernd, All,

On 2016-06-12 11:30 +0200, Bernd Kuhls spake thusly:
> Fixes
> http://autobuild.buildroot.net/results/8fc/8fc8cbc85dacebce5cb6ab13f5ff3b0764117471/
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

(Of course, that can't go in before your previous patch is fixed.)

Regards,
Yann E. MORIN.

> ---
>  package/libv4l/libv4l.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/libv4l/libv4l.mk b/package/libv4l/libv4l.mk
> index bdd28bf..d0a0369 100644
> --- a/package/libv4l/libv4l.mk
> +++ b/package/libv4l/libv4l.mk
> @@ -54,7 +54,7 @@ LIBV4L_CONF_ENV += \
>  	ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \
>  	ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \
>  	ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
> -else ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
> +else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y)
>  LIBV4L_CONF_OPTS += --enable-qv4l2
>  LIBV4L_DEPENDENCIES += qt
>  else
> -- 
> 2.8.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5] package/qt: Add optional support for OpenGL

[Yann E. MORIN]

Bernd, All,

[sorry for the dupe, I forgot to Cc the list initially...]

On 2016-06-12 11:30 +0200, Bernd Kuhls spake thusly:
> 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

Since there is no "none" entry in that choice, it means we can no longer
build with no GL support, right?

Regards,
Yann E. MORIN.

>  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
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'