4 files changed, 44 insertions, 0 deletions

diff --git a/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
new file mode 100644
index 0000000000..afdf2c8f08
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo-1.8.10/hardcoded_libtool.patch
@@ -0,0 +1,17 @@
+Index: cairo-1.8.2/build/aclocal.dolt.m4
+===================================================================
+--- cairo-1.8.2.orig/build/aclocal.dolt.m4
++++ cairo-1.8.2/build/aclocal.dolt.m4
+@@ -163,7 +163,11 @@ done
+ if $modeok && $tagok ; then
+     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+-    exec ${top_builddir_slash}libtool "$[]@"
++__DOLTLIBTOOL__EOF__
++
++echo '    exec ${top_builddir_slash}'${host_alias}-libtool' "$[]@"' >> doltlibtool
++
++    cat << '__DOLTLIBTOOL__EOF__' >> doltlibtool
+ fi
+ __DOLTLIBTOOL__EOF__
+ 
diff --git a/meta/recipes-graphics/cairo/cairo-fpu.inc b/meta/recipes-graphics/cairo/cairo-fpu.inc
new file mode 100644
index 0000000000..bdaf789799
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo-fpu.inc
@@ -0,0 +1,6 @@
+
+def get_cairo_fpu_setting(bb, d):
+        if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+                return "--disable-some-floating-point"
+        return ""
+
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
new file mode 100644
index 0000000000..e73a839671
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Cairo graphics library"
+HOMEPAGE = "http://cairographics.org"
+BUGTRACKER = "http://bugs.freedesktop.org"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "MPLv1.1 & LGPLv2.1"
+DEPENDS = "virtual/libx11 libsm libpng fontconfig libxrender pixman"
+
+#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points 
+require cairo-fpu.inc
+EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)}"
+
+inherit autotools pkgconfig
diff --git a/meta/recipes-graphics/cairo/cairo_1.8.10.bb b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
new file mode 100644
index 0000000000..9e7e7a3bf6
--- /dev/null
+++ b/meta/recipes-graphics/cairo/cairo_1.8.10.bb
@@ -0,0 +1,8 @@
+require cairo.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7d7cc3410ae869ed913ebd30d7f45941"
+
+PR = "r0"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://hardcoded_libtool.patch"