[oe] 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-----