14 files changed, 19 insertions, 13 deletions
diff --git a/recipes/clutter/aaina_svn.bb b/recipes/clutter/aaina_svn.bb
index 862dfd8933..a8c6cf7c8f 100644
--- a/recipes/clutter/aaina_svn.bb
+++ b/recipes/clutter/aaina_svn.bb
@@ -1,7 +1,7 @@
 require aaina.inc
 
 SRCREV = "3597"
-PV = "0.3.0+svnr${SRCREV}"
+PV = "0.3.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
 
diff --git a/recipes/clutter/clutter-0.9_git.bb b/recipes/clutter/clutter-0.9_git.bb
index b7a04ca03a..039417c626 100644
--- a/recipes/clutter/clutter-0.9_git.bb
+++ b/recipes/clutter/clutter-0.9_git.bb
@@ -3,7 +3,7 @@ require clutter.inc
 SRCREV = "13e055a351f83c56b895b131566a6e842d24ed2a"
 
 PV = "1.1.0"
-PR = "r0"
+PR = "${INC_PR}.0"
 PR_append = "+git${SRCREV}"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git \
diff --git a/recipes/clutter/clutter-box2d_svn.bb b/recipes/clutter/clutter-box2d_svn.bb
index 24b9b1feae..8ef7a03982 100644
--- a/recipes/clutter/clutter-box2d_svn.bb
+++ b/recipes/clutter/clutter-box2d_svn.bb
@@ -1,6 +1,6 @@
 require clutter-box2d.inc
 
-PV = "0.0+svnr${SRCREV}"
+PV = "0.0+svnr${SRCPV}"
 PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http"
diff --git a/recipes/clutter/clutter-cairo_svn.bb b/recipes/clutter/clutter-cairo_svn.bb
index 1084c1cc16..f4919ac879 100644
--- a/recipes/clutter/clutter-cairo_svn.bb
+++ b/recipes/clutter/clutter-cairo_svn.bb
@@ -1,6 +1,6 @@
 require clutter-cairo.inc
 
-PV = "0.8.0+svnr${SRCREV}"
+PV = "0.8.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
            file://enable_examples.patch;patch=1"
diff --git a/recipes/clutter/clutter-glx_svn.bb b/recipes/clutter/clutter-glx_svn.bb
index 8a2a1fa1ed..0590330412 100644
--- a/recipes/clutter/clutter-glx_svn.bb
+++ b/recipes/clutter/clutter-glx_svn.bb
@@ -1,6 +1,7 @@
 require clutter.inc
 
 PV = "0.3.1+svn${SRCDATE}"
+PR = "${INC_PR}.0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http"
 
diff --git a/recipes/clutter/clutter-gst_0.4svn.bb b/recipes/clutter/clutter-gst_0.4svn.bb
index 1af797888c..bf74893db6 100644
--- a/recipes/clutter/clutter-gst_0.4svn.bb
+++ b/recipes/clutter/clutter-gst_0.4svn.bb
@@ -1,6 +1,6 @@
 require clutter-gst.inc
 
-PV = "0.4.0+svnr${SRCREV}"
+PV = "0.4.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \
            file://autofoo-0.4.patch;patch=1"
diff --git a/recipes/clutter/clutter-gst_svn.bb b/recipes/clutter/clutter-gst_svn.bb
index 8ef87236f7..3e122c7ca4 100644
--- a/recipes/clutter/clutter-gst_svn.bb
+++ b/recipes/clutter/clutter-gst_svn.bb
@@ -1,6 +1,6 @@
 require clutter-gst.inc
 
-PV = "0.8.0+svnr${SRCREV}"
+PV = "0.8.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \
            file://autofoo.patch;patch=1"
diff --git a/recipes/clutter/clutter.inc b/recipes/clutter/clutter.inc
index 55980eda02..a80d9b6f5a 100644
--- a/recipes/clutter/clutter.inc
+++ b/recipes/clutter/clutter.inc
@@ -7,7 +7,7 @@ COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-3430sdp|mx31ads|qe
 STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+"
 BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 
-DEPENDS = "${STDDEPENDS} mesa"
+DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
 DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib"
@@ -37,6 +37,8 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
 PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
 LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
 
+INC_PR = "r1"
+
 inherit autotools pkgconfig gtk-doc
 
 PACKAGES =+ "clutter-examples"
diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb
index fe1fbc29d3..121b96480f 100644
--- a/recipes/clutter/clutter_0.4svn.bb
+++ b/recipes/clutter/clutter_0.4svn.bb
@@ -1,6 +1,7 @@
 require clutter.inc
 
-PV = "0.4.0+svnr${SRCREV}"
+PV = "0.4.0+svnr${SRCPV}"
+PR = "${INC_PR}.0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \
 	   file://enable_tests-0.4.patch;patch=1 "
diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb
index 79882d6ddf..21cafef85d 100644
--- a/recipes/clutter/clutter_0.6svn.bb
+++ b/recipes/clutter/clutter_0.6svn.bb
@@ -1,6 +1,7 @@
 require clutter.inc
 
-PV = "0.6.0+svnr${SRCREV}"
+PV = "0.6.0+svnr${SRCPV}"
+PR = "${INC_PR}.0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \
 	   file://enable_tests-0.6.patch;patch=1 "
diff --git a/recipes/clutter/clutter_0.8+git.bb b/recipes/clutter/clutter_0.8+git.bb
index e31e250431..391e5fea35 100644
--- a/recipes/clutter/clutter_0.8+git.bb
+++ b/recipes/clutter/clutter_0.8+git.bb
@@ -3,6 +3,7 @@ require clutter.inc
 CLUTTER_REV = "af16378899699376fe7e84c7c11eb3bb5c4668cd"
 
 PV = "0.8.8"
+PR = "${INC_PR}.0"
 PR_append = "+gitr${CLUTTER_REV}"
 
 SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \
diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb
index cdcb2109e0..d8d623c2fe 100644
--- a/recipes/clutter/clutter_svn.bb
+++ b/recipes/clutter/clutter_svn.bb
@@ -2,8 +2,8 @@ require clutter.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PV = "0.8.0+svnr${SRCREV}"
-PR = "r0"
+PV = "0.8.0+svnr${SRCPV}"
+PR = "${INC_PR}.0"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
            file://enable_tests.patch;patch=1;maxrev=2989 \
diff --git a/recipes/clutter/table_svn.bb b/recipes/clutter/table_svn.bb
index 168ea4dfba..039f903d0c 100644
--- a/recipes/clutter/table_svn.bb
+++ b/recipes/clutter/table_svn.bb
@@ -1,6 +1,6 @@
 require table.inc
 
-PV = "0.3.0+svnr${SRCREV}"
+PV = "0.3.0+svnr${SRCPV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \
            file://fixes.patch;patch=1"
diff --git a/recipes/clutter/tidy_svn.bb b/recipes/clutter/tidy_svn.bb
index 348bba0a8e..89d5a5a572 100644
--- a/recipes/clutter/tidy_svn.bb
+++ b/recipes/clutter/tidy_svn.bb
@@ -1,6 +1,6 @@
 require tidy.inc
 
-PV = "0.1.0+svnr${SRCREV}"
+PV = "0.1.0+svnr${SRCPV}"
 PR = "6"
 
 SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \