diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-28 11:28:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-28 16:53:09 +0100 |
commit | fef7a66d9b0a45971be157b1bcea821c5b307a69 (patch) | |
tree | 9d2c154867e7484302e79e286ac03d3b1522d34f /meta/recipes-graphics/clutter/clutter-1.8_git.bb | |
parent | eeab5b223dfa3e24f521aaacf79133e61cef9aa3 (diff) | |
download | poky-fef7a66d9b0a45971be157b1bcea821c5b307a69.tar.gz |
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]
(From OE-Core rev: d5a7a9090b57793be1de63dca86fe40437628e9d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.8_git.bb')
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.8_git.bb | 25 |
1 files changed, 25 insertions, 0 deletions
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 @@ | |||
1 | require clutter.inc | ||
2 | require clutter-package.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
5 | |||
6 | # the 1.8.4 tag | ||
7 | SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459" | ||
8 | PV = "1.8.4+git${SRCPV}" | ||
9 | PR = "r0" | ||
10 | |||
11 | DEFAULT_PREFERENCE = "-1" | ||
12 | |||
13 | SRC_URI = "git://git.gnome.org/clutter;protocol=git;branch=master \ | ||
14 | file://enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch;rev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 \ | ||
15 | file://enable_tests.patch;notrev=654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673 " | ||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | BASE_CONF += "--disable-introspection" | ||
19 | |||
20 | AUTOTOOLS_AUXDIR = "${S}/build" | ||
21 | |||
22 | do_configure_prepend () { | ||
23 | # Disable DOLT | ||
24 | sed -i -e 's/^DOLT//' ${S}/configure.ac | ||
25 | } | ||