clutter-gst/clutter-gtk: Add API versions to the package names and update to the latest code

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

5 files changed, 42 insertions, 17 deletions

diff --git a/meta/packages/clutter/clutter-gst-0.10_git.bb b/meta/packages/clutter/clutter-gst-0.10_git.bb
new file mode 100644
index 0000000000..a0f874db25
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-0.10_git.bb
@@ -0,0 +1,14 @@
+require clutter-gst.inc
+
+PV = "0.10.0+git${SRCPV}"
+
+DEPENDS += "clutter-1.0"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=clutter-gst-0.10"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/packages/clutter/clutter-gst-1.0_git.bb b/meta/packages/clutter/clutter-gst-1.0_git.bb
new file mode 100644
index 0000000000..5580596f09
--- /dev/null
+++ b/meta/packages/clutter/clutter-gst-1.0_git.bb
@@ -0,0 +1,14 @@
+require clutter-gst.inc
+
+PV = "0.11.0+git${SRCPV}"
+
+DEPENDS += "clutter-1.0"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git;branch=master"
+
+S = "${WORKDIR}/git"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/packages/clutter/clutter-gst_git.bb b/meta/packages/clutter/clutter-gst_git.bb
deleted file mode 100644
index 4a72333595..0000000000
--- a/meta/packages/clutter/clutter-gst_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require clutter-gst.inc
-
-PV = "0.9.0+git${SRCPV}"
-PR = "r3"
-
-SRC_URI = "git://git.clutter-project.org/clutter-gst.git;protocol=git \
-           file://autofoo-9db4a61a25677764bb927369c5c68ada958fb65c.patch;patch=1;rev=9db4a61a25677764bb927369c5c68ada958fb65c \
-           file://autofoo.patch;patch=1;notrev=9db4a61a25677764bb927369c5c68ada958fb65c"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend () {
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/packages/clutter/clutter-gtk-0.10_git.bb b/meta/packages/clutter/clutter-gtk-0.10_git.bb
new file mode 100644
index 0000000000..d0613277a7
--- /dev/null
+++ b/meta/packages/clutter/clutter-gtk-0.10_git.bb
@@ -0,0 +1,12 @@
+require clutter-gtk.inc
+
+PV = "0.10.3+git${SRCPV}"
+PR = "r1"
+
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=clutter-gtk-0.10"
+
+S = "${WORKDIR}/git"
+
+DEPENDS += "clutter-1.0"
+
+EXTRA_OECONF += "--disable-introspection"
diff --git a/meta/packages/clutter/clutter-gtk_git.bb b/meta/packages/clutter/clutter-gtk-1.0_git.bb
index 9ea4e96f0a..dfabbd56cc 100644
--- a/meta/packages/clutter/clutter-gtk_git.bb
+++ b/meta/packages/clutter/clutter-gtk-1.0_git.bb
@@ -1,9 +1,9 @@
 require clutter-gtk.inc
 
-PV = "0.9.0+git${SRCPV}"
+PV = "0.90.0+git${SRCPV}"
 PR = "r1"
 
-SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git"
+SRC_URI = "git://git.clutter-project.org/clutter-gtk.git;protocol=git;branch=master"
 
 S = "${WORKDIR}/git"