[oe-commits] org.oe.dev cairo: Add 1.2.4 (including float conversion speedup) (from poky)

[rpurdie commit]

cairo: Add 1.2.4 (including float conversion speedup) (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 72ef3ece03ed7a381b4a1fa6d8ca35e5fad5dc1d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=72ef3ece03ed7a381b4a1fa6d8ca35e5fad5dc1d
Files:
1
packages/cairo/files
packages/cairo/cairo_1.2.4.bb
packages/cairo/files/cairo-fixed.patch
Diffs:

#
# mt diff -rda1a8e6e9b7bc078c9f3a1616a1299cd7715fcae -r72ef3ece03ed7a381b4a1fa6d8ca35e5fad5dc1d
#
# 
# 
# add_dir "packages/cairo/files"
# 
# add_file "packages/cairo/cairo_1.2.4.bb"
#  content [ef5c94a19d8757a3e47bb0d297e6a568fe933784]
# 
# add_file "packages/cairo/files/cairo-fixed.patch"
#  content [6cfc3e4476982b9df6c606664c8918f4e008f92b]
# 
============================================================
--- packages/cairo/cairo_1.2.4.bb	ef5c94a19d8757a3e47bb0d297e6a568fe933784
+++ packages/cairo/cairo_1.2.4.bb	ef5c94a19d8757a3e47bb0d297e6a568fe933784
@@ -0,0 +1,16 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb at debian.org>"
+DEPENDS = "libx11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
+           file://cairo-fixed.patch;patch=1"
+
+inherit autotools pkgconfig 
+
+do_stage () {
+	autotools_stage_all
+}
============================================================
--- packages/cairo/files/cairo-fixed.patch	6cfc3e4476982b9df6c606664c8918f4e008f92b
+++ packages/cairo/files/cairo-fixed.patch	6cfc3e4476982b9df6c606664c8918f4e008f92b
@@ -0,0 +1,43 @@
+diff -ur cairo-1.2.4/src/cairo-fixed.c cairo-1.2.4-new/src/cairo-fixed.c
+--- cairo-1.2.4/src/cairo-fixed.c	2006-06-10 07:07:37.000000000 +0300
++++ cairo-1.2.4-new/src/cairo-fixed.c	2006-08-25 13:06:26.000000000 +0300
+@@ -43,12 +43,6 @@
+ }
+ 
+ cairo_fixed_t
+-_cairo_fixed_from_double (double d)
+-{
+-    return (cairo_fixed_t) floor (d * 65536 + 0.5);
+-}
+-
+-cairo_fixed_t
+ _cairo_fixed_from_26_6 (uint32_t i)
+ {
+     return i << 10;
+diff -ur cairo-1.2.4/src/cairoint.h cairo-1.2.4-new/src/cairoint.h
+--- cairo-1.2.4/src/cairoint.h	2006-08-18 17:20:16.000000000 +0300
++++ cairo-1.2.4-new/src/cairoint.h	2006-08-25 13:14:07.000000000 +0300
+@@ -1117,8 +1117,21 @@
+ 
+ #define CAIRO_FIXED_ONE _cairo_fixed_from_int (1)
+ 
+-cairo_private cairo_fixed_t
+-_cairo_fixed_from_double (double d);
++#define CAIRO_DOUBLE2FIX_MAGIC 103079215104.0 /* 2 ^ (52 - 16) * 1.5 */
++
++#ifdef WORDS_BIGENDIAN
++#define iman 1
++#else
++#define iman 0
++#endif
++
++static inline cairo_fixed_t
++_cairo_fixed_from_double (double d)
++{
++        d = d + CAIRO_DOUBLE2FIX_MAGIC;
++        
++        return ((cairo_fixed_t *) &d)[iman];
++}
+ 
+ cairo_private cairo_fixed_t
+ _cairo_fixed_from_26_6 (uint32_t i);