From d8b88ecd46b1397ff3d598ee82fcaedf6d59e8af Mon Sep 17 00:00:00 2001 From: Ross Burton <ross.burton@intel.com> Date: Thu, 19 Jul 2012 16:11:30 +0100 Subject: clutter: cleanup thanks to new gtk-doc.bbclass Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 ++ meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +- meta/recipes-graphics/clutter/clutter.inc | 4 ++-- 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 @@ require recipes-graphics/clutter/clutter.inc require recipes-graphics/clutter/clutter-package.inc +PR = "r1" + # We're API/ABI compatible and this may make things easier for layers PROVIDES += "clutter-1.6" 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" # the 1.8.4 tag SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459" PV = "1.8.4+git${SRCPV}" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" 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/" LICENSE = "LGPLv2.1+" # Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8 -STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk" -BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" +STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk" +BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}" DEPENDS = "${STDDEPENDS} virtual/libgl" EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" -- cgit v1.2.3