* [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional
@ 2015-04-24 20:02 Dmitry Eremin-Solenikov
2015-04-24 21:20 ` Martin Jansa
0 siblings, 1 reply; 4+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-24 20:02 UTC (permalink / raw)
To: openembedded-core
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@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)}"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional
2015-04-24 20:02 [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional Dmitry Eremin-Solenikov
@ 2015-04-24 21:20 ` Martin Jansa
2015-04-25 10:14 ` Dmitry Eremin-Solenikov
0 siblings, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2015-04-24 21:20 UTC (permalink / raw)
To: Dmitry Eremin-Solenikov; +Cc: openembedded-core
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@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.
> PROVIDES += "qt4-x11"
> QT4DEPENDS = ""
>
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional
2015-04-24 21:20 ` Martin Jansa
@ 2015-04-25 10:14 ` Dmitry Eremin-Solenikov
0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-04-25 10:14 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
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@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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional
@ 2015-05-11 19:50 Dmitry Eremin-Solenikov
0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Eremin-Solenikov @ 2015-05-11 19:50 UTC (permalink / raw)
To: openembedded-core
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.
Using PACKAGECONFIG for this seems to be unreasonable: it is not used by
qt4-x11-free to track other dependencies. Also QT_GLFLAGS variable
properly tracks passing -opengl or -no-opengl to configure script.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@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)}"
PROVIDES += "qt4-x11"
QT4DEPENDS = ""
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-05-11 19:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-24 20:02 [PATCH] qt4-x11-free: make virtual/libgl dependecy conditional Dmitry Eremin-Solenikov
2015-04-24 21:20 ` Martin Jansa
2015-04-25 10:14 ` Dmitry Eremin-Solenikov
-- strict thread matches above, loose matches on Subject: below --
2015-05-11 19:50 Dmitry Eremin-Solenikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox