Patchwork [meta-qt5,jansa/qt5-5.2.1] qtbase.inc: set virtual/mesa and virtual/egl as dependency in PACKAGECONFIG[kms]

login
register
mail settings
Submitter Andreas Müller
Date Feb. 25, 2014, 5:16 p.m.
Message ID <1393348614-15618-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/67429/
State Accepted, archived
Headers show

Comments

Andreas Müller - Feb. 25, 2014, 5:16 p.m.
* there is no kms around
* mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
* in configure we find:
  | if [ "$CFG_KMS" = "yes" ]; then
  |     if [ "$CFG_EGL" = "no" ]; then
  |         echo "The KMS plugin requires EGL support and cannot be built"
  |         exit 101
  |     fi
  | fi

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 recipes-qt/qt5/qtbase.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - Feb. 25, 2014, 5:27 p.m.
On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote:
> * there is no kms around
> * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
> * in configure we find:
>   | if [ "$CFG_KMS" = "yes" ]; then
>   |     if [ "$CFG_EGL" = "no" ]; then
>   |         echo "The KMS plugin requires EGL support and cannot be built"
>   |         exit 101
>   |     fi
>   | fi
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  recipes-qt/qt5/qtbase.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> index 116c86f..6c6ec5a 100644
> --- a/recipes-qt/qt5/qtbase.inc
> +++ b/recipes-qt/qt5/qtbase.inc
> @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+"
>  PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
>  PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
> -PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
> +PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"

Maybe we should introduce some virtual/gbm later, but I'm ok with
virtual/mesa until we have it.

Also there is no virtual/mesa in oe-core/dylan, but I guess that there
is minimum user with dylan who also want kms.

BTW: jansa/qt5-5.2.1 branch was already merged to master, so I plan to
apply this only for master (jansa/qt5-5.2.1 is dead-end).

>  # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
>  PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
>  PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"
> -- 
> 1.8.3.1
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Andreas Müller - Feb. 25, 2014, 7:06 p.m.
On Tue, Feb 25, 2014 at 6:27 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote:
>> * there is no kms around
>> * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
>> * in configure we find:
>>   | if [ "$CFG_KMS" = "yes" ]; then
>>   |     if [ "$CFG_EGL" = "no" ]; then
>>   |         echo "The KMS plugin requires EGL support and cannot be built"
>>   |         exit 101
>>   |     fi
>>   | fi
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  recipes-qt/qt5/qtbase.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
>> index 116c86f..6c6ec5a 100644
>> --- a/recipes-qt/qt5/qtbase.inc
>> +++ b/recipes-qt/qt5/qtbase.inc
>> @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+"
>>  PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
>>  PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
>>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
>> -PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
>> +PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
>
> Maybe we should introduce some virtual/gbm later, but I'm ok with
> virtual/mesa until we have it.
virtual/mesa has different meanings gbm / wayland-egl - it took me a
while to get mesa-free...
>
> Also there is no virtual/mesa in oe-core/dylan, but I guess that there
> is minimum user with dylan who also want kms.
>
> BTW: jansa/qt5-5.2.1 branch was already merged to master, so I plan to
> apply this only for master (jansa/qt5-5.2.1 is dead-end).
I missed that - thanks

Andreas
Andreas Müller - March 6, 2014, 2 p.m.
On Tue, Feb 25, 2014 at 8:06 PM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Tue, Feb 25, 2014 at 6:27 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote:
>>> * there is no kms around
>>> * mesa is the default implementation for (lib)gbm (see config.tests/qpa/kms)
>>> * in configure we find:
>>>   | if [ "$CFG_KMS" = "yes" ]; then
>>>   |     if [ "$CFG_EGL" = "no" ]; then
>>>   |         echo "The KMS plugin requires EGL support and cannot be built"
>>>   |         exit 101
>>>   |     fi
>>>   | fi
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>>> ---
>>>  recipes-qt/qt5/qtbase.inc | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
>>> index 116c86f..6c6ec5a 100644
>>> --- a/recipes-qt/qt5/qtbase.inc
>>> +++ b/recipes-qt/qt5/qtbase.inc
>>> @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+"
>>>  PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
>>>  PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
>>>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
>>> -PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
>>> +PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
>>
>> Maybe we should introduce some virtual/gbm later, but I'm ok with
>> virtual/mesa until we have it.
> virtual/mesa has different meanings gbm / wayland-egl - it took me a
> while to get mesa-free...
>>
>> Also there is no virtual/mesa in oe-core/dylan, but I guess that there
>> is minimum user with dylan who also want kms.
>>
ping for master?

Andreas
Martin Jansa - March 6, 2014, 2:32 p.m.
It's already in master-next, will be merged soon, sorry for delay.


On Thu, Mar 6, 2014 at 3:00 PM, Andreas Müller <schnitzeltony@googlemail.com
> wrote:

> On Tue, Feb 25, 2014 at 8:06 PM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Tue, Feb 25, 2014 at 6:27 PM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >> On Tue, Feb 25, 2014 at 06:16:54PM +0100, Andreas Müller wrote:
> >>> * there is no kms around
> >>> * mesa is the default implementation for (lib)gbm (see
> config.tests/qpa/kms)
> >>> * in configure we find:
> >>>   | if [ "$CFG_KMS" = "yes" ]; then
> >>>   |     if [ "$CFG_EGL" = "no" ]; then
> >>>   |         echo "The KMS plugin requires EGL support and cannot be
> built"
> >>>   |         exit 101
> >>>   |     fi
> >>>   | fi
> >>>
> >>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> >>> ---
> >>>  recipes-qt/qt5/qtbase.inc | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
> >>> index 116c86f..6c6ec5a 100644
> >>> --- a/recipes-qt/qt5/qtbase.inc
> >>> +++ b/recipes-qt/qt5/qtbase.inc
> >>> @@ -108,7 +108,7 @@ PACKAGECONFIG[gtkstyle] =
> "-gtkstyle,-no-gtkstyle,gtk+"
> >>>  PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
> >>>  PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
> >>>  PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
> >>> -PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
> >>> +PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
> >>
> >> Maybe we should introduce some virtual/gbm later, but I'm ok with
> >> virtual/mesa until we have it.
> > virtual/mesa has different meanings gbm / wayland-egl - it took me a
> > while to get mesa-free...
> >>
> >> Also there is no virtual/mesa in oe-core/dylan, but I guess that there
> >> is minimum user with dylan who also want kms.
> >>
> ping for master?
>
> Andreas
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Patch

diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 116c86f..6c6ec5a 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -108,7 +108,7 @@  PACKAGECONFIG[gtkstyle] = "-gtkstyle,-no-gtkstyle,gtk+"
 PACKAGECONFIG[directfb] = "-directfb,-no-directfb,directfb"
 PACKAGECONFIG[linuxfb] = "-linuxfb,-no-linuxfb"
 PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm"
-PACKAGECONFIG[kms] = "-kms,-no-kms,kms"
+PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl"
 # needed for qtdeclarative (qtdeclarative.do_configure fails to find quick module without)
 PACKAGECONFIG[icu] = "-icu,-no-icu,${ICU}"
 PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev"