* [PATCH] qt4-*-gles: add RPROVIDES for the main and -dev packages
@ 2011-06-10 18:24 Denys Dmytriyenko
2011-06-10 18:43 ` Koen Kooi
0 siblings, 1 reply; 2+ messages in thread
From: Denys Dmytriyenko @ 2011-06-10 18:24 UTC (permalink / raw)
To: openembedded-devel
Select the proper provider in case someone RDEPENDS on -gles packages.
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
recipes/qt4/qt4-embedded-gles_4.6.3.bb | 5 ++++-
recipes/qt4/qt4-embedded-gles_4.7.3.bb | 6 ++++--
recipes/qt4/qt4-x11-free-gles_4.6.3.bb | 4 +++-
recipes/qt4/qt4-x11-free-gles_4.7.3.bb | 4 +++-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.3.bb b/recipes/qt4/qt4-embedded-gles_4.6.3.bb
index 0b047fc..6f1253e 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.3.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.3.bb
@@ -1,7 +1,10 @@
require qt4-embedded.inc
-PR = "${INC_PR}.8"
+PR = "${INC_PR}.9"
PROVIDES += "qt4-embedded"
+RPROVIDES_${PN} = "qt4-embedded"
+RPROVIDES_${PN}-dev = "qt4-embedded-dev"
+
QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
require qt-${PV}.inc
diff --git a/recipes/qt4/qt4-embedded-gles_4.7.3.bb b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
index 8ab5a6c..b62cb60 100644
--- a/recipes/qt4/qt4-embedded-gles_4.7.3.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
@@ -2,11 +2,14 @@ DEFAULT_PREFERENCE = "-1"
require qt4-embedded.inc
-PR = "${INC_PR}.10"
+PR = "${INC_PR}.11"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
PROVIDES += "qt4-embedded"
+RPROVIDES_${PN} = "qt4-embedded"
+RPROVIDES_${PN}-dev = "qt4-embedded-dev"
+
QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
@@ -16,4 +19,3 @@ require qt-${PV}.inc
QT_CONFIG_FLAGS += " \
-exceptions \
"
-
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
index b7cbde5..34795ee 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
@@ -1,5 +1,5 @@
require qt4-x11-free.inc
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
@@ -15,3 +15,5 @@ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
DEPENDS += "virtual/egl"
require recipes/egl/egl.inc
PROVIDES += "qt4-x11-free"
+RPROVIDES_${PN} = "qt4-x11-free"
+RPROVIDES_${PN}-dev = "qt4-x11-free"
diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
index c5fd6f3..93367e4 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
@@ -1,7 +1,7 @@
DEFAULT_PREFERENCE = "-1"
require qt4-x11-free.inc
-PR = "${INC_PR}.7"
+PR = "${INC_PR}.8"
QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
@@ -17,3 +17,5 @@ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
DEPENDS += "virtual/egl"
require recipes/egl/egl.inc
PROVIDES += "qt4-x11-free"
+RPROVIDES_${PN} = "qt4-x11-free"
+RPROVIDES_${PN}-dev = "qt4-x11-free"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] qt4-*-gles: add RPROVIDES for the main and -dev packages
2011-06-10 18:24 [PATCH] qt4-*-gles: add RPROVIDES for the main and -dev packages Denys Dmytriyenko
@ 2011-06-10 18:43 ` Koen Kooi
0 siblings, 0 replies; 2+ messages in thread
From: Koen Kooi @ 2011-06-10 18:43 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 10-06-11 20:24, Denys Dmytriyenko wrote:
> Select the proper provider in case someone RDEPENDS on -gles packages.
This wasn't done on purpose since it will break qt builds for anyone
that hasn't set a preferred provided *and* is inside the masking for the
gles recipe.
You'd be better of with something like this in local.conf:
RPROVIDES_pn-qt4-embedded-gles += "qt4-embedded"
RPROVIDES_pn-qt4-embedded-gles-dev = "qt4-embedded-dev"
Or blacklist the regular qt recipes.
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> recipes/qt4/qt4-embedded-gles_4.6.3.bb | 5 ++++-
> recipes/qt4/qt4-embedded-gles_4.7.3.bb | 6 ++++--
> recipes/qt4/qt4-x11-free-gles_4.6.3.bb | 4 +++-
> recipes/qt4/qt4-x11-free-gles_4.7.3.bb | 4 +++-
> 4 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/recipes/qt4/qt4-embedded-gles_4.6.3.bb b/recipes/qt4/qt4-embedded-gles_4.6.3.bb
> index 0b047fc..6f1253e 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.6.3.bb
> +++ b/recipes/qt4/qt4-embedded-gles_4.6.3.bb
> @@ -1,7 +1,10 @@
> require qt4-embedded.inc
> -PR = "${INC_PR}.8"
> +PR = "${INC_PR}.9"
>
> PROVIDES += "qt4-embedded"
> +RPROVIDES_${PN} = "qt4-embedded"
> +RPROVIDES_${PN}-dev = "qt4-embedded-dev"
> +
> QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
>
> require qt-${PV}.inc
> diff --git a/recipes/qt4/qt4-embedded-gles_4.7.3.bb b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
> index 8ab5a6c..b62cb60 100644
> --- a/recipes/qt4/qt4-embedded-gles_4.7.3.bb
> +++ b/recipes/qt4/qt4-embedded-gles_4.7.3.bb
> @@ -2,11 +2,14 @@ DEFAULT_PREFERENCE = "-1"
>
> require qt4-embedded.inc
>
> -PR = "${INC_PR}.10"
> +PR = "${INC_PR}.11"
>
> QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
>
> PROVIDES += "qt4-embedded"
> +RPROVIDES_${PN} = "qt4-embedded"
> +RPROVIDES_${PN}-dev = "qt4-embedded-dev"
> +
> QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr"
>
> FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded"
> @@ -16,4 +19,3 @@ require qt-${PV}.inc
> QT_CONFIG_FLAGS += " \
> -exceptions \
> "
> -
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
> index b7cbde5..34795ee 100644
> --- a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
> +++ b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb
> @@ -1,5 +1,5 @@
> require qt4-x11-free.inc
> -PR = "${INC_PR}.7"
> +PR = "${INC_PR}.8"
>
> QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
>
> @@ -15,3 +15,5 @@ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
> DEPENDS += "virtual/egl"
> require recipes/egl/egl.inc
> PROVIDES += "qt4-x11-free"
> +RPROVIDES_${PN} = "qt4-x11-free"
> +RPROVIDES_${PN}-dev = "qt4-x11-free"
> diff --git a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> index c5fd6f3..93367e4 100644
> --- a/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> +++ b/recipes/qt4/qt4-x11-free-gles_4.7.3.bb
> @@ -1,7 +1,7 @@
> DEFAULT_PREFERENCE = "-1"
>
> require qt4-x11-free.inc
> -PR = "${INC_PR}.7"
> +PR = "${INC_PR}.8"
>
> QT_GLFLAGS = "-opengl es2 -depths 16,24,32 "
>
> @@ -17,3 +17,5 @@ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free"
> DEPENDS += "virtual/egl"
> require recipes/egl/egl.inc
> PROVIDES += "qt4-x11-free"
> +RPROVIDES_${PN} = "qt4-x11-free"
> +RPROVIDES_${PN}-dev = "qt4-x11-free"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFN8mXKMkyGM64RGpERAiUwAJ0XxlLV8yMCNJN/aYLtp0GVwIq7UgCfcdZn
vxS6tJzn2O5IvZTeTqE4PUQ=
=AbgQ
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-10 18:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-10 18:24 [PATCH] qt4-*-gles: add RPROVIDES for the main and -dev packages Denys Dmytriyenko
2011-06-10 18:43 ` Koen Kooi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.