summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-19 16:11:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-22 11:42:19 +0100
commit9f779782238beb074374f802cd888829e3993331 (patch)
treebd23455be5e3d0de6c42e2e779fc34a4df133abe
parent8bd2eb623f57c6b79d03cd6aef1ec945eeef08d4 (diff)
downloadpoky-9f779782238beb074374f802cd888829e3993331.tar.gz
clutter: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: d8b88ecd46b1397ff3d598ee82fcaedf6d59e8af) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.8_git.bb2
-rw-r--r--meta/recipes-graphics/clutter/clutter.inc4
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
index 378b6fe32d..a37056883d 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
@@ -1,6 +1,8 @@
1require recipes-graphics/clutter/clutter.inc 1require recipes-graphics/clutter/clutter.inc
2require recipes-graphics/clutter/clutter-package.inc 2require recipes-graphics/clutter/clutter-package.inc
3 3
4PR = "r1"
5
4# We're API/ABI compatible and this may make things easier for layers 6# We're API/ABI compatible and this may make things easier for layers
5PROVIDES += "clutter-1.6" 7PROVIDES += "clutter-1.6"
6 8
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
index 9f7b048a94..7d8bcb3f42 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
6# the 1.8.4 tag 6# the 1.8.4 tag
7SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459" 7SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
8PV = "1.8.4+git${SRCPV}" 8PV = "1.8.4+git${SRCPV}"
9PR = "r0" 9PR = "r1"
10 10
11DEFAULT_PREFERENCE = "-1" 11DEFAULT_PREFERENCE = "-1"
12 12
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 9d7760f019..ce54ac2940 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4 4
5# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8 5# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
6STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk" 6STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
7BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 7BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
8 8
9DEPENDS = "${STDDEPENDS} virtual/libgl" 9DEPENDS = "${STDDEPENDS} virtual/libgl"
10EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 10EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"