Skip to contentSkip to conversation

qt4-*-gles: add RPROVIDES for the main and -dev packages

PATCH In review Denys Dmytriyenko 2 participants 2 messages Jun 10, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4-*-gles: add RPROVIDES for the main and -dev packages

Select the proper provider in case someone RDEPENDS on -gles packages.

---
 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(-)
recipes/qt4/qt4-embedded-gles_4.6.3.bb +4 -1
index 0b047fc..6f1253e 100644
@@ -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
recipes/qt4/qt4-embedded-gles_4.7.3.bb +4 -2
index 8ab5a6c..b62cb60 100644
@@ -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 \
 "
-
recipes/qt4/qt4-x11-free-gles_4.6.3.bb +3 -1
index b7cbde5..34795ee 100644
@@ -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"
recipes/qt4/qt4-x11-free-gles_4.7.3.bb +3 -1
index c5fd6f3..93367e4 100644
@@ -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"
Signature · 1 line
1.7.0.4
#1 lore raw

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

Quoted 1 line · Denys Dmytriyenko

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.

Quoted 81 lines
---
 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(-)
recipes/qt4/qt4-embedded-gles_4.6.3.bb +4 -1
index 0b047fc..6f1253e 100644
@@ -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
recipes/qt4/qt4-embedded-gles_4.7.3.bb +4 -2
index 8ab5a6c..b62cb60 100644
@@ -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 \
 "
-
recipes/qt4/qt4-x11-free-gles_4.6.3.bb +3 -1
index b7cbde5..34795ee 100644
@@ -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"
recipes/qt4/qt4-x11-free-gles_4.7.3.bb +1 -1
index c5fd6f3..93367e4 100644
@@ -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 "
 

recipes/qt4/qt4-x11-free-gles_4.7.3.bb FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" · line 21

Quoted 5 lines
recipes/qt4/qt4-x11-free-gles_4.7.3.bb +2 -0
@@ -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-----