From af08ee5ad6c894e81790bbb14f85629de5a66687 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 4 Jul 2014 21:10:49 +0200
Subject: [PATCH] Pixman: update to latest version

* Cairo needs at least 0.22
* Also remove !x86_gcc2 restriction since it builds and passes all
tests.
---
 x11-libs/pixman/pixman-0.20.0.recipe |  7 +--
 x11-libs/pixman/pixman-0.32.4.recipe | 84 ++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+), 6 deletions(-)
 create mode 100644 x11-libs/pixman/pixman-0.32.4.recipe

diff --git a/x11-libs/pixman/pixman-0.20.0.recipe b/x11-libs/pixman/pixman-0.20.0.recipe
index b0051e825..b51b46a89 100644
--- a/x11-libs/pixman/pixman-0.20.0.recipe
+++ b/x11-libs/pixman/pixman-0.20.0.recipe
@@ -15,12 +15,7 @@ COPYRIGHT="1987-1998  The Open Group
 
 REVISION="1"
 
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
diff --git a/x11-libs/pixman/pixman-0.32.4.recipe b/x11-libs/pixman/pixman-0.32.4.recipe
new file mode 100644
index 000000000..d8ed72312
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.32.4.recipe
@@ -0,0 +1,84 @@
+SUMMARY="pixman"
+DESCRIPTION="
+Pixman - The pixel-manipulation library for X and cairo.
+"
+HOMEPAGE="http://cgit.freedesktop.org/pixman/" 
+SRC_URI="http://cairographics.org/releases/pixman-$portVersion.tar.gz"
+CHECKSUM_SHA256="80c7ed420e8a3ae749800241e6347c3d55681296cab71384be7969cd9e657e84"
+LICENSE="MIT"
+COPYRIGHT="1987-1998  The Open Group
+	1987-1989 Digital Equipment Corporation
+	1999, 2004, 2008 Keith Packard
+	2004-2010 Red Hat, Inc.
+	2009-2010 Sun Microsystems, Inc.
+	and many others"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	pixman$secondaryArchSuffix = $portVersion
+	lib:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+PROVIDES_devel="
+	pixman${secondaryArchSuffix}_devel = $portVersion
+	devel:libpixman_1$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+REQUIRES_devel="
+	pixman$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+PATCH()
+{
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac
+}
+
+BUILD()
+{
+	aclocal
+	libtoolize --force --copy --install
+	automake --add-missing
+	autoconf
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libpixman-1
+
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+}