summaryrefslogtreecommitdiffstats
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-22 11:42:17 +0100
commitd0a8a0d1385f05a540588431a9b54d4177f278cd (patch)
treeaa858219a1f9067ad41718542d21c1147b881584
parenta7d5d6192d6d37c9748b7b992b50a79ec9f16fac (diff)
downloadpoky-d0a8a0d1385f05a540588431a9b54d4177f278cd.tar.gz
cogl: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 69bae4de251da32e26eae5a57d7dccc904db17da) 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/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"
2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" 2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4 4
5STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi" 5STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
6BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" 6BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
7 7
8DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite" 8DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite"
9EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" 9EXTRA_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 @@
1require cogl.inc 1require cogl.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 5LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
6 6
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"
5# the 1.8.2 tag 5# the 1.8.2 tag
6SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5" 6SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
7PV = "1.8.2+git${SRCPV}" 7PV = "1.8.2+git${SRCPV}"
8PR = "r1" 8PR = "r2"
9 9
10DEFAULT_PREFERENCE = "-1" 10DEFAULT_PREFERENCE = "-1"
11 11