[OE-core] [PATCH] qt4-x11-free: Fix Qt4 to build without opengl

[Paul Eggleton]

Hi Fabien,

On Thursday 22 January 2015 15:08:35 Fabien Proriol wrote:
> ---
>  meta/recipes-qt/qt4/qt4-x11-free.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc
> b/meta/recipes-qt/qt4/qt4-x11-free.inc index 3b1e0fe..d1b88ea 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -4,7 +4,8 @@ SUMMARY = "Cross-platform UI toolkit and application
> framework (X11 version)" DESCRIPTION = "Qt is a versatile cross-platform
> application framework -- this is the X11 version." HOMEPAGE =
> "http://qt-project.org/"
>  SECTION = "x11/libs"
> -DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext
> libxrender libxrandr libxcursor" +DEPENDS += "virtual/libx11 fontconfig
> libxft libxext libxrender libxrandr libxcursor" 
> +DEPENDS +=
> "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}

This is OK, but looking at how GL is configured in this file (via QT_GLFLAGS
which is set via ?= and thus could be overridden) I think maybe we should
check whether QT_CONFIG_FLAGS contains -opengl, i.e.:

DEPENDS += "${@bb.utils.contains('QT_CONFIG_FLAGS', '-opengl', 'virtual/libgl', '', d)}"

(In other recipes we use PACKAGECONFIG to solve this kind of thing, but for
various reasons we aren't using PACKAGECONFIG in the Qt recipes apart from
qt-mobility).

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre