From d5a7a9090b57793be1de63dca86fe40437628e9d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 28 Mar 2012 11:28:00 +0000
Subject: clutter: clutter_git is really clutter-1.8_git, rename

Both these clutter recipes provide 1.8. With different PN namespace, a world
build cna build both causing the clutter libraries to "disappear" at certain
points of the build. In particular, this causes issues for mx.

This patch puts then into the same PN namespace so only one can be built.

[YOCTO #2158]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/clutter/clutter-1.8_git.bb | 25 ++++++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter_git.bb     | 25 ------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb
 delete mode 100644 meta/recipes-graphics/clutter/clutter_git.bb

(limited to 'meta/recipes-graphics')

diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
new file mode 100644
index 0000000000..9f7b048a94
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
@@ -0,0 +1,25 @@
+require clutter.inc
+require clutter-package.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+# the 1.8.4 tag
+SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
+PV = "1.8.4+git${SRCPV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \
+           file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
+           file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
+S = "${WORKDIR}/git"
+
+BASE_CONF += "--disable-introspection"
+
+AUTOTOOLS_AUXDIR = "${S}/build"
+
+do_configure_prepend () {
+	# Disable DOLT
+	sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
diff --git a/meta/recipes-graphics/clutter/clutter_git.bb b/meta/recipes-graphics/clutter/clutter_git.bb
deleted file mode 100644
index 9f7b048a94..0000000000
--- a/meta/recipes-graphics/clutter/clutter_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require clutter.inc
-require clutter-package.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-# the 1.8.4 tag
-SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
-PV = "1.8.4+git${SRCPV}"
-PR = "r0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \
-           file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \
-           file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 "
-S = "${WORKDIR}/git"
-
-BASE_CONF += "--disable-introspection"
-
-AUTOTOOLS_AUXDIR = "${S}/build"
-
-do_configure_prepend () {
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-- 
cgit 1.2.3-korg