Add Cairo and Pixman (slightly outdated) to toolchain

toolchain/install.sh

@@ -69,9 +69,7 @@ pushd build
         make || bail
         make install || bail
     popd
-    #
     # XXX zlib can not be built in a separate directory
-    #
     pushd ../tarballs/zlib*
         CC=i686-pc-toaru-gcc ./configure --static --prefix=$PREFIX/$TARGET --solo || bail
         make || bail
@@ -85,4 +83,23 @@ pushd build
         make || bail
         make install || bail
     popd
+    if [ ! -d pixman ]; then
+        mkdir pixman
+    fi
+    pushd pixman
+        $DIR/tarballs/pixman-0.26.2/configure --host=$TARGET --prefix=$PREFIX/$TARGET || bail
+        make || bail
+        make install || bail
+    popd
+    if [ ! -d cairo ]; then
+        mkdir cairo
+    fi
+    pushd cairo
+        $DIR/tarballs/cairo-1.12.2/configure --host=$TARGET --prefix=$PREFIX/$TARGET --enable-ps=no --enable-pdf=no --enable-interpreter=no || bail
+        cp $DIR/patches/cairo-Makefile test/Makefile
+        cp $DIR/patches/cairo-Makefile perf/Makefile
+        echo -e "\n\n#define CAIRO_NO_MUTEX 1" >> config.h
+        make || bail
+        make install || bail
+    popd
 popd

toolchain/patches/cairo-1.12.2.patch

@@ -0,0 +1,11 @@
+diff -rupN original/build/config.sub new/build/config.sub
+--- original/build/config.sub	2012-03-08 15:09:13.000000000 -0500
++++ new/build/config.sub	2012-05-17 11:40:42.308339450 -0400
+@@ -1338,6 +1338,7 @@ case $os in
+ 	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
++	      | -toaru* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \

toolchain/patches/cairo-Makefile

@@ -0,0 +1,7 @@
+derp:
+	@echo "lol"
+
+all: derp
+install: derp
+distclean: derp
+clean: derp

toolchain/patches/pixman-0.26.2.patch

@@ -0,0 +1,35 @@
+diff -rupN original/config.sub new/config.sub
+--- original/config.sub	2012-03-08 15:09:13.000000000 -0500
++++ new/config.sub	2012-05-17 11:40:42.308339450 -0400
+@@ -1338,6 +1338,7 @@ case $os in
+ 	      | -sym* | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ 	      | -aos* | -aros* \
++	      | -toaru* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+diff -rupN original/pixman/pixman-utils.c new/pixman/pixman-utils.c
+--- original/pixman/pixman-utils.c   2012-06-29 11:25:17.000000000 -0700
++++ new/pixman/pixman-utils.c   2012-09-16 01:35:44.000000000 -0700
+@@ -41,7 +41,10 @@
+     } cache [N_CACHED_FAST_PATHS];
+ } cache_t;
+ 
+-PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);
++//PIXMAN_DEFINE_THREAD_LOCAL (cache_t, fast_path_cache);
++//
++
++cache_t fast_path_cache;
+ 
+ pixman_bool_t
+ _pixman_lookup_composite_function (pixman_implementation_t     *toplevel,
+@@ -60,7 +63,7 @@
+     int i;
+ 
+     /* Check cache for fast paths */
+-    cache = PIXMAN_GET_THREAD_LOCAL (fast_path_cache);
++    cache = &fast_path_cache; //PIXMAN_GET_THREAD_LOCAL (fast_path_cache);
+ 
+     for (i = 0; i < N_CACHED_FAST_PATHS; ++i)
+     {

toolchain/prepare.sh

@@ -29,8 +29,10 @@ pushd "$DIR" > /dev/null
         grab "freetype" "http://download.savannah.gnu.org/releases/freetype" "freetype-2.4.9.tar.gz"
         grab "zlib" "http://zlib.net" "zlib-1.2.7.tar.gz"
         grab "libpng" "https://github.com/downloads/klange/osdev" "libpng-1.5.13.tar.gz"
+        grab "pixman" "http://www.cairographics.org/releases" "pixman-0.26.2.tar.gz"
+        grab "cairo" "http://www.cairographics.org/releases" "cairo-1.12.2.tar.xz"
         $INFO "wget" "Pulled source packages."
-        rm -rf "binutils-2.22" "freetype-2.4.9" "gcc-4.6.0" "gmp-5.0.1" "libpng-1.5.13" "mpc-0.9" "mpfr-3.0.1" "newlib-1.19.0" "zlib-1.2.7"
+        rm -rf "binutils-2.22" "freetype-2.4.9" "gcc-4.6.0" "gmp-5.0.1" "libpng-1.5.13" "mpc-0.9" "mpfr-3.0.1" "newlib-1.19.0" "zlib-1.2.7" "pixman-0.28.2"
         $INFO "tar"  "Decompressing..."
         deco "gcc"  "gcc-core-4.6.0.tar.gz"
         deco "g++"  "gcc-g++-4.6.0.tar.gz"
@@ -42,6 +44,8 @@ pushd "$DIR" > /dev/null
         deco "freetype" "freetype-2.4.9.tar.gz"
         deco "zlib" "zlib-1.2.7.tar.gz"
         deco "libpng" "libpng-1.5.13.tar.gz"
+        deco "pixman" "pixman-0.26.2.tar.gz"
+        deco "cairo" "cairo-1.12.2.tar.xz"
         $INFO "tar"  "Decompressed source packages."
         $INFO "patch" "Patching..."
         patc "gcc"  "gcc-4.6.0"
@@ -52,6 +56,8 @@ pushd "$DIR" > /dev/null
         patc "newlib" "newlib-1.19.0"
         patc "freetype" "freetype-2.4.9"
         patc "libpng" "libpng-1.5.13"
+        patc "pixman" "pixman-0.26.2"
+        patc "cairo" "cairo-1.12.2"
         $INFO "patch" "Patched third-party software."
         $INFO "--" "Running additional bits..."
         #deleteUnusedGCC "gcc-4.6.0"