3 files changed, 36 insertions, 1 deletions

diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index 387f6ecf43..f264151c0b 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
-FILESPATH = "${FILE_DIRNAME}/clutter"
+FILESPATH = "${FILE_DIRNAME}/cogl"
 
 inherit autotools pkgconfig gtk-doc gettext
 
diff --git a/meta/recipes-graphics/clutter/cogl/macro-versions.patch b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
new file mode 100644
index 0000000000..87ea1f7d0f
--- /dev/null
+++ b/meta/recipes-graphics/clutter/cogl/macro-versions.patch
@@ -0,0 +1,26 @@
+Index: cogl-1.8.0/configure.ac
+===================================================================
+--- cogl-1.8.0.orig/configure.ac
++++ cogl-1.8.0/configure.ac
+@@ -833,7 +833,7 @@ LT_INIT([disable-static])
+ dnl ================================================================
+ dnl I18n stuff.
+ dnl ================================================================
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE="cogl"
+Index: cogl-1.8.0/po/Makefile.in.in
+===================================================================
+--- cogl-1.8.0.orig/po/Makefile.in.in
++++ cogl-1.8.0/po/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.0.bb b/meta/recipes-graphics/clutter/cogl_1.8.0.bb
new file mode 100644
index 0000000000..02ed67cda5
--- /dev/null
+++ b/meta/recipes-graphics/clutter/cogl_1.8.0.bb
@@ -0,0 +1,9 @@
+require cogl.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
+           file://macro-versions.patch"
+
+SRC_URI[md5sum] = "cd18c28bf3dd0008b072cb9c5eed7821"
+SRC_URI[sha256sum] = "5ed9ee014367058a63d99a13e3fcc8cb8c6acb19ece00195c6df034fd8d8d8c7"