Qt4 GLES (once again)

Qt4 GLES (once again)

[Holger Hans Peter Freyther]

Hi Koen, All,

we have the GLES problem once again in the Qt4 recipes. My opinion is still 
the same that a "bitbake meta-toolchain-qte" should work without requiring 
downloading proprietary stuff from TI/PowerVR.

From what I think to know, the only difference between GLES and the non GLES 
recipe is that we have one plugin more. Koen could you help me to verify that?

If the above is the case, we could just use qt4-embedded-gles (without 
claiming to provide anything else) and then just package the GLES plugin?


what do you think?

	regards z.

Re: Qt4 GLES (once again)

[Koen Kooi]

On 19-12-09 08:54, Holger Hans Peter Freyther wrote:
> Hi Koen, All,
>
> we have the GLES problem once again in the Qt4 recipes. My opinion is still
> the same that a "bitbake meta-toolchain-qte" should work without requiring
> downloading proprietary stuff from TI/PowerVR.

Exactly

>  From what I think to know, the only difference between GLES and the non GLES
> recipe is that we have one plugin more. Koen could you help me to verify that?

For qt/e it's one plugin more (a gfxdriver) and library (openvg) and for 
qt/x11 it's one plugin (gldriver) + 2 libs (opengl + openvg) more.

> If the above is the case, we could just use qt4-embedded-gles (without
> claiming to provide anything else) and then just package the GLES plugin?

That was my original goal, but the current structure of the .inc makes 
that very hard to do. I tried packaging *only* the extra stuff, but that 
leave to with one big problem: you need to build regular QT first and 
you can't build QT if a QT is present in staging.

I'm open to suggestions that don't involve useflags.

regards,

Koen

Re: Qt4 GLES (once again)

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 20-12-09 20:05, Koen Kooi wrote:
> On 19-12-09 08:54, Holger Hans Peter Freyther wrote:
>> Hi Koen, All,
>>
>> we have the GLES problem once again in the Qt4 recipes. My opinion is
>> still
>> the same that a "bitbake meta-toolchain-qte" should work without
>> requiring
>> downloading proprietary stuff from TI/PowerVR.
> 
> Exactly
> 
>>  From what I think to know, the only difference between GLES and the
>> non GLES
>> recipe is that we have one plugin more. Koen could you help me to
>> verify that?
> 
> For qt/e it's one plugin more (a gfxdriver) and library (openvg) and for
> qt/x11 it's one plugin (gldriver) + 2 libs (opengl + openvg) more.

It looks like it also changes stuff in libQtGui(E) :(

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLMiloMkyGM64RGpERAsCYAKCu7ora2XgofUYjPZaznsbySr8x2QCglffO
97qYBGfnD1kQZYXvVm4/sNk=
=FvSK
-----END PGP SIGNATURE-----

Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther]

On Wednesday 23 December 2009 15:30:00 Koen Kooi wrote:
> On 20-12-09 20:05, Koen Kooi wrote:

> It looks like it also changes stuff in libQtGui(E) :(

it does, it is compiling the egl and OpenVG part into libQtGui... 


what about something like this? This way one can select qt4-embedded as 
default and switch to the gles variant when ones needs it?



diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-
gles_4.6.0.bb
index f819c66..06cdcc5 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -1,6 +1,7 @@
 require qt4-embedded.inc
 PR = "${INC_PR}.0"
 
+PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
 require qt-4.6.0.inc

Re: Qt4 GLES (once again)

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01-01-10 13:48, Holger Hans Peter Freyther wrote:
> On Wednesday 23 December 2009 15:30:00 Koen Kooi wrote:
>> On 20-12-09 20:05, Koen Kooi wrote:
> 
>> It looks like it also changes stuff in libQtGui(E) :(
> 
> it does, it is compiling the egl and OpenVG part into libQtGui... 
> 
> 
> what about something like this? This way one can select qt4-embedded as 
> default and switch to the gles variant when ones needs it?

If that works, I can live with that.

regards,

Koen

> 
> 
> 
> diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-
> gles_4.6.0.bb
> index f819c66..06cdcc5 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> @@ -1,6 +1,7 @@
>  require qt4-embedded.inc
>  PR = "${INC_PR}.0"
>  
> +PROVIDES += "qt4-embedded"
>  QT_GLFLAGS = "-opengl es2 -openvg"
>  
>  require qt-4.6.0.inc

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLPwOiMkyGM64RGpERAmelAJwJd3cqDmXGpbvEidLqG5CW/bhOPgCeOjzV
uXKmwv73mpZgYn2LWi9kXCA=
=2TBV
-----END PGP SIGNATURE-----

Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther]

On Saturday 02 January 2010 09:28:18 Koen Kooi wrote:

> If that works, I can live with that.

Hi Koen,

that is the current patch. It is working for the !GLES case and it would be
great if you could test the GLES case and then I would be happy to commit
it.


ich@knecht:/data/openembedded/openembedded$ cat 0001-qt4-embedded-make-qt4-embedded-and-qt4-
embedded-gles.patch 
From 4b7c9f94bc7441919e1b9e24179e0b45236739ae Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 4 Jan 2010 15:37:05 +0800
Subject: [PATCH] qt4-embedded: make qt4-embedded and qt4-embedded-gles both provide qt4-embedded

This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles"
to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated
library most of the time provided as a binary blob by the vendor requiring the user
to manually download and store it at the right place.
---
 conf/compatibility-providers.conf      |    1 +
 recipes/qt4/qt4-embedded-gles_4.6.0.bb |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2..cf61ab5 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
+PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
 PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
 PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index f819c66..06cdcc5 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -1,6 +1,7 @@
 require qt4-embedded.inc
 PR = "${INC_PR}.0"
 
+PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
 require qt-4.6.0.inc
-- 
1.6.5





> 
> regards,
> 
> Koen
> 
> > diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> > b/recipes/qt4/qt4-embedded- gles_4.6.0.bb
> > index f819c66..06cdcc5 100644
> > --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> > +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> > @@ -1,6 +1,7 @@
> >  require qt4-embedded.inc
> >  PR = "${INC_PR}.0"
> >
> > +PROVIDES += "qt4-embedded"
> >  QT_GLFLAGS = "-opengl es2 -openvg"
> >
> >  require qt-4.6.0.inc
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 

Re: Qt4 GLES (once again)

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04-01-10 08:40, Holger Hans Peter Freyther wrote:
> On Saturday 02 January 2010 09:28:18 Koen Kooi wrote:
> 
>> If that works, I can live with that.
> 
> Hi Koen,
> 
> that is the current patch. It is working for the !GLES case and it would be
> great if you could test the GLES case and then I would be happy to commit
> it.

For one it's missing the qt4-x11 case :)

regards,

Koen

> 
> 
> ich@knecht:/data/openembedded/openembedded$ cat 0001-qt4-embedded-make-qt4-embedded-and-qt4-
> embedded-gles.patch 
> From 4b7c9f94bc7441919e1b9e24179e0b45236739ae Mon Sep 17 00:00:00 2001
> From: Holger Hans Peter Freyther <zecke@selfish.org>
> Date: Mon, 4 Jan 2010 15:37:05 +0800
> Subject: [PATCH] qt4-embedded: make qt4-embedded and qt4-embedded-gles both provide qt4-embedded
> 
> This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles"
> to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated
> library most of the time provided as a binary blob by the vendor requiring the user
> to manually download and store it at the right place.
> ---
>  conf/compatibility-providers.conf      |    1 +
>  recipes/qt4/qt4-embedded-gles_4.6.0.bb |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
> index 10a81f2..cf61ab5 100644
> --- a/conf/compatibility-providers.conf
> +++ b/conf/compatibility-providers.conf
> @@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
>  PREFERRED_PROVIDER_opkg ?= "opkg"
>  #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
>  PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
> +PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
>  PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
>  PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
>  PREFERRED_PROVIDER_tslib-conf ?= "tslib"
> diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> index f819c66..06cdcc5 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> @@ -1,6 +1,7 @@
>  require qt4-embedded.inc
>  PR = "${INC_PR}.0"
>  
> +PROVIDES += "qt4-embedded"
>  QT_GLFLAGS = "-opengl es2 -openvg"
>  
>  require qt-4.6.0.inc

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLQaUgMkyGM64RGpERAiziAKC5XLmNDn/ZnMtfNCn/Z5PZZOZziQCdEiWt
yRluDfRgv/sO6OcWRWb7kwE=
=ZKyX
-----END PGP SIGNATURE-----

Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther]

On Monday 04 January 2010 09:21:52 Koen Kooi wrote:
> On 04-01-10 08:40, Holger Hans Peter Freyther wrote:
> > On Saturday 02 January 2010 09:28:18 Koen Kooi wrote:
> >> If that works, I can live with that.
> >
> > Hi Koen,
> >
> > that is the current patch. It is working for the !GLES case and it would
> > be great if you could test the GLES case and then I would be happy to
> > commit it.
> 
> For one it's missing the qt4-x11 case :)

could you please test?

From 10bd4976831427aadee784ca046d9aedb6ea1407 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 4 Jan 2010 15:37:05 +0800
Subject: [PATCH] qt4: Make the gles variants for Embedded and X11 provide the normal variant

This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles"
to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated
library most of the time provided as a binary blob by the vendor requiring the user
to manually download and store it at the right place.

For X11 we already have a PREFERRED_PROVIDER setting in place and don't need to update.
---
 conf/compatibility-providers.conf               |    1 +
 recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled |    1 +
 recipes/qt4/qt4-embedded-gles_4.6.0.bb          |    1 +
 recipes/qt4/qt4-x11-free-gles_4.5.2.bb          |    1 +
 recipes/qt4/qt4-x11-free-gles_4.6.0.bb          |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2..cf61ab5 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
+PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
 PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
 PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
index 5aa07c2..a888e7d 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
@@ -9,6 +9,7 @@ require qt4-embedded_${PV}.bb
 LICENSE = "LGPLv2.1 GPLv3"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-embedded"
 SRC_URI += "file://sgx-hack.patch;patch=1"
 
 export EXTRA_QMAKE_MUNGE = " glmunge "
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index f819c66..06cdcc5 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -1,6 +1,7 @@
 require qt4-embedded.inc
 PR = "${INC_PR}.0"
 
+PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
 require qt-4.6.0.inc
diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
index cd81841..a3f60bf 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
@@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb
 PR = "${INC_PR}.3"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-x11-free"
 #SRC_URI += "file://sgx-hack.patch;patch=1"
 SRC_URI += "file://hack-out-pg_config.patch;patch=1"
 
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
index a74feaf..cc3aeed 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
@@ -13,5 +13,6 @@ QT_CONFIG_FLAGS += " \
 FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-x11-free"
 
 
-- 
1.6.5

Re: Qt4 GLES (once again)

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 04-01-10 11:25, Holger Hans Peter Freyther wrote:

> For X11 we already have a PREFERRED_PROVIDER setting in place and don't need to update.

Thats not quite true, only qt4x11 is defined, but we need qt4-x11-free.

> ---
>  conf/compatibility-providers.conf               |    1 +
>  recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled |    1 +
>  recipes/qt4/qt4-embedded-gles_4.6.0.bb          |    1 +
>  recipes/qt4/qt4-x11-free-gles_4.5.2.bb          |    1 +
>  recipes/qt4/qt4-x11-free-gles_4.6.0.bb          |    1 +
>  5 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
> index 10a81f2..cf61ab5 100644
> --- a/conf/compatibility-providers.conf
> +++ b/conf/compatibility-providers.conf
> @@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
>  PREFERRED_PROVIDER_opkg ?= "opkg"
>  #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
>  PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
> +PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
>  PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
>  PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
>  PREFERRED_PROVIDER_tslib-conf ?= "tslib"
> diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
> index 5aa07c2..a888e7d 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
> +++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
> @@ -9,6 +9,7 @@ require qt4-embedded_${PV}.bb
>  LICENSE = "LGPLv2.1 GPLv3"
>  
>  DEPENDS += "virtual/egl"
> +PROVIDES += "qt4-embedded"
>  SRC_URI += "file://sgx-hack.patch;patch=1"
>  
>  export EXTRA_QMAKE_MUNGE = " glmunge "
> diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> index f819c66..06cdcc5 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
> @@ -1,6 +1,7 @@
>  require qt4-embedded.inc
>  PR = "${INC_PR}.0"
>  
> +PROVIDES += "qt4-embedded"
>  QT_GLFLAGS = "-opengl es2 -openvg"
>  
>  require qt-4.6.0.inc
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
> index cd81841..a3f60bf 100644
> --- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
> +++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
> @@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb
>  PR = "${INC_PR}.3"
>  
>  DEPENDS += "virtual/egl"
> +PROVIDES += "qt4-x11-free"
>  #SRC_URI += "file://sgx-hack.patch;patch=1"
>  SRC_URI += "file://hack-out-pg_config.patch;patch=1"
>  
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
> index a74feaf..cc3aeed 100644
> --- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
> +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
> @@ -13,5 +13,6 @@ QT_CONFIG_FLAGS += " \
>  FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
>  
>  DEPENDS += "virtual/egl"
> +PROVIDES += "qt4-x11-free"
>  
>  

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLQcR/MkyGM64RGpERAhihAJ4rTawa5X9G5LBJSUtKlNzLyW+WWACgiFKR
C1M0OR8CoPeTWwIVzGuBlgU=
=4yvX
-----END PGP SIGNATURE-----

Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther]

On Monday 04 January 2010 11:35:43 Koen Kooi wrote:
> On 04-01-10 11:25, Holger Hans Peter Freyther wrote:
> > For X11 we already have a PREFERRED_PROVIDER setting in place and don't
> > need to update.
> 
> Thats not quite true, only qt4x11 is defined, but we need qt4-x11-free.

Good point. Should we keep both? What about replacing all occurences of qt4-
x11-free with qt4x11? Or do you think it makes sense to make all of them 
provide qt4x11 and qt4-x11-free?

z

PS: Could you test the Embedded variant for now?

Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther]

[-- Attachment #1: Type: Text/Plain, Size: 478 bytes --]

On Monday 04 January 2010 11:35:43 Koen Kooi wrote:
> On 04-01-10 11:25, Holger Hans Peter Freyther wrote:
> > For X11 we already have a PREFERRED_PROVIDER setting in place and don't
> > need to update.
> 
> Thats not quite true, only qt4x11 is defined, but we need qt4-x11-free.

What about these two? I'm killing the qt4x11 PROVIDER stupidity... It does not 
make any sense nowadays and we should kill "-free" from the Qt package in the 
future as well.

z.




[-- Attachment #2: 0001-qt4x11-Cease-out-the-qt4x11-PROVIDER.patch --]
[-- Type: text/x-patch, Size: 2693 bytes --]

From 252fb7cc8618f2f16b724a1b0a844d27fb3bb4b0 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 6 Jan 2010 12:22:16 +0800
Subject: [PATCH 1/5] qt4x11: Cease out the qt4x11 PROVIDER

* The LGPL and Commercial edition are actually the same tarball.
* If someone sees the need he can take qt qt4-recipes and specify
  -commercial in the compilation.
---
 classes/qt4x11.bbclass            |    2 +-
 conf/compatibility-providers.conf |    2 +-
 conf/distro/kaeilos.conf          |    4 ----
 recipes/qt4/qt4-x11-free.inc      |    1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass
index aa2e2a1..2d56b7e 100644
--- a/classes/qt4x11.bbclass
+++ b/classes/qt4x11.bbclass
@@ -1,4 +1,4 @@
-DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}"
+DEPENDS_prepend = "${@["qt4-x11-free ", ""][(bb.data.getVar('PN', d, 1)[:12] == 'qt4-x11-free')]}"
 
 inherit qmake2
 
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2..61a3730 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,7 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
+PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"
 PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_tslib ?= "tslib"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 4d790f4..03595db 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -182,10 +182,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc
index ade148b..dffe3a0 100644
--- a/recipes/qt4/qt4-x11-free.inc
+++ b/recipes/qt4/qt4-x11-free.inc
@@ -4,7 +4,6 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor"
-PROVIDES = "qt4x11"
 
 INC_PR = "r14"
 
-- 
1.6.5


[-- Attachment #3: 0002-qt4-Make-the-gles-variants-for-Embedded-and-X11-prov.patch --]
[-- Type: text/x-patch, Size: 3876 bytes --]

From 3d941e890f9eeab142d5521a72fbb563a2d804ed Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Mon, 4 Jan 2010 15:37:05 +0800
Subject: [PATCH 2/5] qt4: Make the gles variants for Embedded and X11 provide the normal variant

This way a distribution/user can set PREFERRED_PROVIDER_qt4-embedded = "qt4-embedded-gles"
to select the GLES/OpenVG runtime. The default is qt4-embedded as GLES require a dedicated
library most of the time provided as a binary blob by the vendor requiring the user
to manually download and store it at the right place.

For X11 we already have a PREFERRED_PROVIDER setting in place and don't need to update.
---
 conf/compatibility-providers.conf               |    1 +
 recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled |    1 +
 recipes/qt4/qt4-embedded-gles_4.6.0.bb          |    1 +
 recipes/qt4/qt4-x11-free-gles_4.5.2.bb          |    1 +
 recipes/qt4/qt4-x11-free-gles_4.6.0.bb          |    1 +
 recipes/qt4/qt4-x11-free-gles_git.bb.disabled   |    1 +
 6 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 61a3730..0d8e9bc 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,6 +47,7 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
+PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
 PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"
 PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
diff --git a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
index 5aa07c2..a888e7d 100644
--- a/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
+++ b/recipes/qt4/qt4-embedded-gles_4.5.2.bb.disabled
@@ -9,6 +9,7 @@ require qt4-embedded_${PV}.bb
 LICENSE = "LGPLv2.1 GPLv3"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-embedded"
 SRC_URI += "file://sgx-hack.patch;patch=1"
 
 export EXTRA_QMAKE_MUNGE = " glmunge "
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index 04e074f..915dd07 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -1,6 +1,7 @@
 require qt4-embedded.inc
 PR = "${INC_PR}.1"
 
+PROVIDES += "qt4-embedded"
 QT_GLFLAGS = "-opengl es2 -openvg"
 
 require qt-4.6.0.inc
diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
index cd81841..a3f60bf 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb
@@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb
 PR = "${INC_PR}.3"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-x11-free"
 #SRC_URI += "file://sgx-hack.patch;patch=1"
 SRC_URI += "file://hack-out-pg_config.patch;patch=1"
 
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
index 089992c..8d09d89 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
@@ -13,5 +13,6 @@ QT_CONFIG_FLAGS += " \
 FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
 
 DEPENDS += "virtual/egl"
+PROVIDES += "qt4-x11-free"
 
 
diff --git a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
index 22db2df..5977891 100644
--- a/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
+++ b/recipes/qt4/qt4-x11-free-gles_git.bb.disabled
@@ -5,6 +5,7 @@ FILESPATHPKG =. "qt4-x11-free-${PV}:qt4-x11-free:"
 QT_GLFLAGS = "-opengl es1 -openvg" 
 
 require qt4-x11-free.inc
+PROVIDES = "qt4-x11-free"
 LICENSE = "LGPLv2.1 GPLv3"
 PR = "${INC_PR}.0+gitr${SRCREV}"
 
-- 
1.6.5

Re: Qt4 GLES (once again)

[Martin Jansa]

With qt4 providers set only in compatibility-providers-conf and default
versions (no P_V for qt4 packages).

I got lots of bitbake errors like this:

NOTE: Runtime target 'qt4-x11-free-gles' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['qt4-x11-free-gles', 'virtual/egl']
ERROR: '[]' RDEPENDS/RRECOMMENDS or otherwise requires the runtime entity 'virtual/egl' but it wasn't found in any PACKAGE or RPROVIDES variables
NOTE: Runtime target 'virtual/egl' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['virtual/egl']

Whole bitbake -D -e qt4-x11-free log is temporary here 
http://jama.homelinux.org/org.openembedded.shr.images/qt4-x11-free.log

With 4.6.0 versions (as specified in conf/distro/include/angstrom-2008-preferred-versions.inc)
there is only this 1st error.

It probably builds ok after those bitbake errors, but is there 
some way to silent them in case they are harmless?

Not sure if it was different with provider named qt4-x11.

Regards,

-- 
uin:136542059                jid:Martin.Jansa@gmail.com
Jansa Martin                 sip:jamasip@voip.wengo.fr 
JaMa