Re: Qt4 GLES (once again)

[Holger Hans Peter Freyther <holger+oe@freyther.de>]

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