[OE-core] [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional

[Dmitry Eremin-Solenikov]

On 04/25/2015 12:20 AM, Martin Jansa wrote:
> On Fri, Apr 24, 2015 at 11:02:21PM +0300, Dmitry Eremin-Solenikov wrote:
>> Make qt4-x11-free depend on virtual/libgl only if the DISTRO_FEATURES
>> contain opengl. Otherwise there will be no package to fullfil this
>> dependency.
>>
>> Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin at mentor.com>
>> ---
>>   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..835fc96 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)}"
>
> That still leaves opengl support to be autodetected from sysroot for
> distributions without opengl in DISTRO_FEATURES but where someone built
> virtual/libgl provider before qt4-x11-free.
>
> You need to use PACKAGECONFIG to explicitly disable it when it should be
> disabled based on DISTRO_FEATURES.

I have checked the qt4-x11-free.inc file. It correctly sets QT_GLFLAGS 
depending on the presence of 'opengl' in DISTRO_FEATURES. So my patch is 
correct.


-- 
With best wishes
Dmitry