aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-07-19 15:14:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-20 14:27:41 +0100
commit69bae4de251da32e26eae5a57d7dccc904db17da (patch)
tree97788216293bcb710fbcbbde426805d4d8a2f3ec
parent38284f890bbed3c3f24044bbae8c25da604ca187 (diff)
downloadopenembedded-core-69bae4de251da32e26eae5a57d7dccc904db17da.tar.gz
cogl: cleanup thanks to new gtk-doc.bbclass
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-graphics/clutter/cogl.inc4
-rw-r--r--meta/recipes-graphics/clutter/cogl_1.8.2.bb2
-rw-r--r--meta/recipes-graphics/clutter/cogl_git.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index f2ad6d1269..7d840be96d 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
LICENSE = "LGPLv2.1+"
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
+BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
index 25875f344a..f73359828e 100644
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
@@ -1,6 +1,6 @@
require cogl.inc
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 689b965288..682f93101b 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.2 tag
SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
PV = "1.8.2+git${SRCPV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"