various cairo build fixes

gfx/cairo/cairo/src/cairo-atsui-font.c

@@ -39,6 +39,15 @@
 #include "cairoint.h"
 #include "cairo.h"
 
+/*
+ * FixedToFloat/FloatToFixed are 10.3+ SDK items - include definitions
+ * here so we can use older SDKs.
+ */
+#ifndef FixedToFloat
+#define fixed1              ((Fixed) 0x00010000L)
+#define FixedToFloat(a)     ((float)(a) / fixed1)
+#define FloatToFixed(a)     ((Fixed)((float)(a) * fixed1))
+#endif
 typedef struct _cairo_atsui_font_face cairo_atsui_font_face_t;
 typedef struct _cairo_atsui_font cairo_atsui_font_t;
 

gfx/cairo/cairo/src/cairoint.h

@@ -179,6 +179,10 @@ do {					\
     assert (NOT_REACHED);		\
 } while (0)
 
+#ifndef M_PI
+#define M_PI           3.14159265358979323846
+#endif
+
 #include "cairo-wideint.h"
 
 typedef int32_t		cairo_fixed_16_16_t;