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

Package-Manager: portage-2.1.6.13/cvs/Linux ia64

5 files changed, 46 insertions, 20 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/Manifest b/x11-libs/pixman/Manifest
index a81b359c0d01..a6af1b4c9bb9 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pixman-0.12.0-sse.patch 536 RMD160 2eac636c530c1911765111766bb121b075d6b3dc SHA1 5a51a7f339faf1fd33b803442f27cca09e9eceb0 SHA256 2708f2fb856c706af9ae89570508afc1e72c05348d989ed813a3e2cc85582cf1
+AUX pixman-0.17.2-armv7.patch 698 RMD160 c88feced691854c5bca716205b9548b29855814b SHA1 5dbb6ce2cc61cdf44f5689b2c91958060ce79466 SHA256 fa73add6a6cc13bcd29ae22041c18cb13521ba12e0c9cae32c85fc40f2f42886
 DIST pixman-0.10.0.tar.bz2 312275 RMD160 16c356f5fa3dfa4c0196456552daca3ab6244276 SHA1 9262e945281877c42d484098de664dcf1a68d857 SHA256 2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
 DIST pixman-0.12.0.tar.bz2 364262 RMD160 7881189a1de21ec5d2e27936c65369f121dcb15f SHA1 0c57c6c7e21e2545257068f52517c460e6e51ae4 SHA256 a82b54382a82c2fb42f7ad2c8f363e945602a5183f6df685b69a584d3b25b228
 DIST pixman-0.14.0.tar.bz2 352625 RMD160 b3a8124ffd04096a87ae8e4e044de68a3a0aad36 SHA1 495e9de7b113365d0b7fe902f846734dfe2e1546 SHA256 eb6d14a582cd5055c52e8278641984c17945a8693733214a5d5a10b4f849ca4d
@@ -12,14 +10,7 @@ EBUILD pixman-0.10.0.ebuild 446 RMD160 af1f2b392d8f4de3db56ea13a8dce002c4ce9c71
 EBUILD pixman-0.12.0.ebuild 1188 RMD160 3d528bfcc05e6dbdb59c87707d5cf71d0bb80407 SHA1 9ccd44817676adfb65110ed96fba0ce07edb4cf5 SHA256 98a010c22fab3ff13fcb8f1ba380bf52b3d5a00beec60302b1d93e7658c32637
 EBUILD pixman-0.14.0-r1.ebuild 1599 RMD160 c8e21f7094524c235ec7ad8580de15d72ab4455a SHA1 5348410562e88f7a04d1365847fef63ff631bef0 SHA256 00001022663be1efed2e3dde62b8ef7f1f51b902c44eb9a4fbed4934334598db
 EBUILD pixman-0.16.0.ebuild 1596 RMD160 ed752ce1c891c07e57f8886c878771e831f1af9b SHA1 c18f7615710b17a8423707d39b1faf67bae49744 SHA256 c2a66130820839dea3360c4d9f71d1afd7ca4aaf32286e164e173f477606595b
-EBUILD pixman-0.16.2.ebuild 1536 RMD160 fc1eaa9368ceb043c0c35b270101e6ea5ccc550c SHA1 e552471e629dd4780b9ebec2852be92e8d7f8abe SHA256 40e24d4a9ff1e0f98ff3fe481f303bd64e498b2539afbe92f02af170d3d5be07
-EBUILD pixman-0.17.2.ebuild 1534 RMD160 32c4f20ecbfc4612022a1e74cf0e3b75423818e3 SHA1 e97508127812c8fab721e7c35d409b62e7e6da34 SHA256 4b142d578a2de6cf47c94ee82de99b8fbb037330913d7ea81efc42cebb4800f8
-MISC ChangeLog 8342 RMD160 2bfda8125808ec4ac2cb520a29d06bba7a0e653f SHA1 401349ae3f4c6a18cf86259509316f1350ff9dd9 SHA256 8614b053cdf4f10063917d6e12cab5e55195585545ba86e65e0ce5e24a815d85
+EBUILD pixman-0.16.2.ebuild 1538 RMD160 bb908565648885ac5bd36444bc9e6a42282e172a SHA1 528990a5e5940b2dc69c7b5e3960343eea7a8d7b SHA256 d887e71f25ee0be75877b0fe6af6c40c00fb7fb5dfdb39914277532ad09539a9
+EBUILD pixman-0.17.2.ebuild 1647 RMD160 43aca180563a5b829c7fa7cd085ab8105c1244b7 SHA1 ee9bbde42742a9e7c2c9e739a24c14493f65f44e SHA256 cb6b202bf7b29bcb19aa9c3154506516f1de01e0b40d357359b9fc06e0051bc2
+MISC ChangeLog 8545 RMD160 844d4e1e25fad9d2f7e5575a3132c9559cd6db1b SHA1 c4c8425999ad1e79e9a1d2cc077175efab6ad9f9 SHA256 7fcfd567d1b11a59ef73c23c49a4c09b9d3daef28b06daf0245f41d3d4a91844
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks3owwACgkQcsIHjyDViGSwhQCcDRhou5wKRZt7qCZ6JI2+pjhI
-76MAn0I411yzAH2RcmxSc0uED1AVf836
-=h7XT
------END PGP SIGNATURE-----
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
+}
+