Add patch to fix build failure on armv4 and mark 0.16.2 stable on arm

(Portage version: 2.1.6.13/cvs/Linux ia64)

4 files changed, 42 insertions, 7 deletions

diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index d79a544adc29..96c4c8c51756 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pixman
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.57 2009/12/27 18:11:43 josejx Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.58 2010/01/12 20:47:11 armin76 Exp $
+
+  12 Jan 2010; Raúl Porcel <armin76@gentoo.org> pixman-0.16.2.ebuild,
+  pixman-0.17.2.ebuild, +files/pixman-0.17.2-armv7.patch:
+  Add patch to fix build failure on armv4 and mark 0.16.2 stable on arm
 
   27 Dec 2009; Joseph Jezak <josejx@gentoo.org> pixman-0.17.2.ebuild:
   Marked ppc stable for bug #294958.
diff --git a/x11-libs/pixman/files/pixman-0.17.2-armv7.patch b/x11-libs/pixman/files/pixman-0.17.2-armv7.patch
new file mode 100644
index 000000000000..ee62521108a6
--- /dev/null
+++ b/x11-libs/pixman/files/pixman-0.17.2-armv7.patch
@@ -0,0 +1,22 @@
+From a47b5167c4c1b55b2f51e29ab0782c2659bec312 Mon Sep 17 00:00:00 2001
+From: Siarhei Siamashka <siarhei.siamashka@nokia.com>
+Date: Tue, 08 Dec 2009 06:52:34 +0000
+Subject: ARM: added '.arch armv7a' directive to NEON assembly file
+
+This fix prevents build failure due to not accepting PLD instruction when
+compiling for armv4 cpu with the relevant -mcpu/-march options set in CFLAGS.
+---
+diff --git a/pixman/pixman-arm-neon-asm.S b/pixman/pixman-arm-neon-asm.S
+index e8ccf77..e66fb86 100644
+--- a/pixman/pixman-arm-neon-asm.S
++++ b/pixman/pixman-arm-neon-asm.S
+@@ -41,6 +41,7 @@
+ 
+     .text
+     .fpu neon
++    .arch armv7a
+     .altmacro
+ 
+ #include "pixman-arm-neon-asm.h"
+--
+cgit v0.8.3-6-g21f6
diff --git a/x11-libs/pixman/pixman-0.16.2.ebuild b/x11-libs/pixman/pixman-0.16.2.ebuild
index e204bcd17fed..4d1a03c81964 100644
--- a/x11-libs/pixman/pixman-0.16.2.ebuild
+++ b/x11-libs/pixman/pixman-0.16.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.16.2.ebuild,v 1.1 2009/09/29 10:49:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.16.2.ebuild,v 1.2 2010/01/12 20:47:11 armin76 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular toolchain-funcs versionator
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="altivec mmx sse2"
 
 pkg_setup() {
diff --git a/x11-libs/pixman/pixman-0.17.2.ebuild b/x11-libs/pixman/pixman-0.17.2.ebuild
index 722b9c584051..92626289440a 100644
--- a/x11-libs/pixman/pixman-0.17.2.ebuild
+++ b/x11-libs/pixman/pixman-0.17.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.17.2.ebuild,v 1.5 2009/12/27 18:11:43 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.17.2.ebuild,v 1.6 2010/01/12 20:47:11 armin76 Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -44,3 +44,12 @@ pkg_setup() {
 		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
 	esac
 }
+
+src_unpack() {
+	x-modular_src_unpack
+	cd "${S}"
+
+	# Late fix for ARM
+	epatch "${FILESDIR}"/${P}-armv7.patch
+}
+