From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Fri, 12 Aug 2011 18:26:05 +0000 (+0000)
Subject: Fix FEATURES=test SIGBUS failure on sparc32. bug #371525 by Matt Turner, patch is... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=06ae529943142cd003c950baab671e318e9a2ea4;p=gentoo.git

Fix FEATURES=test SIGBUS failure on sparc32. bug #371525 by Matt Turner, patch is from upstream.

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64
---

diff --git a/media-libs/lcms/ChangeLog b/media-libs/lcms/ChangeLog
index 237b66deee09..83c91aca3477 100644
--- a/media-libs/lcms/ChangeLog
+++ b/media-libs/lcms/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/lcms
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.128 2011/06/12 16:41:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/ChangeLog,v 1.129 2011/08/12 18:26:05 slyfox Exp $
+
+  12 Aug 2011; Sergei Trofimovich <slyfox@gentoo.org> lcms-2.2-r1.ebuild,
+  +files/lcms-2.2-fix-test-on-sparc.patch:
+  Fix FEATURES=test SIGBUS failure on sparc32. bug #371525 by Matt Turner,
+  patch is from upstream.
 
 *lcms-2.2-r1 (12 Jun 2011)
 
diff --git a/media-libs/lcms/Manifest b/media-libs/lcms/Manifest
index f616431cd3df..4b02024252c4 100644
--- a/media-libs/lcms/Manifest
+++ b/media-libs/lcms/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX lcms-1.19-disable_static_modules.patch 578 RMD160 258765bda276cfe1e4a73111ac094962096570ca SHA1 3d54655f2f78a506559c3ebd5a93bb80bd6cce5e SHA256 bd56a283da65a7ab262d35c890a99e8b103a3a73e50b997e404c3c0ac3ae467e
+AUX lcms-2.2-fix-test-on-sparc.patch 1075 RMD160 1bfa375e074f88824d138d23124e3ae2962fd0c4 SHA1 2b6a2c0aafcbb60e020219574fc22ba6c0f45f33 SHA256 798a698e1c8e16db26d3438d9125857a92bbe30c96ff292c68177a989dc4b7df
 AUX lcms-2.2-header.patch 226 RMD160 9543dbf51ea82f40ff8c236ffe07db19bb48c72f SHA1 08234a777a49f059bb84c87b685d631824f725ff SHA256 e9a38177648562a8d3f4fe85fb3ffbdda35f7c6597e91fc28fa8e6770267cf20
 AUX lcms-2.2-lm.patch 190 RMD160 4ed185aa95f645b353e56db37d35286b3d46c18f SHA1 194a8c6762193302e53bd0444686e2f596734080 SHA256 bc8150de3232285ac32227ff18b4b9c81a3cdb162225bd363e136f8d5bd26a1c
 DIST lcms-1.19.tar.gz 927752 RMD160 530615c061dccdcb64d75c6fab148dd565bb6c91 SHA1 d5b075ccffc0068015f74f78e4bc39138bcfe2d4 SHA256 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9
@@ -11,14 +12,14 @@ DIST lcms2-2.2.tar.gz 4193353 RMD160 8e35a351c9549e53ebe4f120cdc5cf35e8b693fc SH
 EBUILD lcms-1.19.ebuild 2447 RMD160 f63ee9c525464258ea4a9ab792ea821865ded602 SHA1 a3c297ea5fbaecbe558143cbd68e7a78757bbae1 SHA256 a5c52ea3d29ed0a271d6cc7529c4eb7a87b4cf8163c2e400b19cb289f629c224
 EBUILD lcms-2.0a.ebuild 1187 RMD160 d85c909ca8bbf0e112d305ec954b63030af4acde SHA1 40869412a64aa3ca4c814d86b12f0a7bfa4046ee SHA256 870841cc551478bcb5f7ad41c9abbfc2ff5d23ebd3f4cc97018e666ad0b9f4fa
 EBUILD lcms-2.1.ebuild 1149 RMD160 9a9a453214ec91af8b078e7672aef9b1aa61e443 SHA1 dafc59e7f99418e74e54e0a58103a3500735914b SHA256 e70fd14bbccdbbc60b9394d685710425549bfee430ae956620104da6967db3e4
-EBUILD lcms-2.2-r1.ebuild 1186 RMD160 e45d6a0f355539bf39bcea69db4470a6cfce2ba1 SHA1 2f0ef6f860f99573cb9d94df3c2f60d3bd325ef6 SHA256 395a21f7c79a2e51641abb967443d5ccc8d78e447b0fad6f844c7f2b81de3235
+EBUILD lcms-2.2-r1.ebuild 1230 RMD160 d8a0e9878887c12ec3142086963506ae27fa8223 SHA1 bc0959de8e080566b18d91cd4f5a8c6ee1e976cb SHA256 53440e49d608d34507e6ee1070719696b4e7f058fd51eb9fe29ec2b559ada1a5
 EBUILD lcms-2.2.ebuild 1147 RMD160 1699d04c642283cee26a7d0e336a31b7b1f3fae7 SHA1 138faeeaf9bf807a991db7b99c0f502b18318ec7 SHA256 26ae40cafeb6f52383b8de327940a396d87e6cb5f6a1aa01edacda00a473ff4e
-MISC ChangeLog 15562 RMD160 4fe6848e12f2c2758d26a633319185433c8c195f SHA1 4ad9fc16bd83e76f9834addf4caa87b14d1339f5 SHA256 ab91cb74e043fe0eab54663e0af169048741c01f3706ad4535e4d0cb83b6f255
+MISC ChangeLog 15778 RMD160 4067bdd28ba90e7e65b62556e6752250e218c341 SHA1 1b98db6145b45d942954aec09fbeaf56f9ff960b SHA256 d2438dcfe8238f1a0751650d50aae6a5b98b8cd1ff16743b9de40a9157a3bef8
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk306ygACgkQXkR9YqOcLPG4LAD9EO8UykafaIdNvcxo/XqwGPti
-iwVKN6qLKnT4hSGpMxUA/A8DexsZ8LvlWiln00m4mO6M1n7XZosYcLsqUv8ByuZq
-=TYsg
+iEYEARECAAYFAk5FcQwACgkQcaHudmEf86ql+QCePhPXnrb0nkTz+n27SCk9GaH/
+h9oAnReNaQmK2Xvne0I1JD4fNMDfguj7
+=2coh
 -----END PGP SIGNATURE-----
diff --git a/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch b/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch
new file mode 100644
index 000000000000..08e91c552184
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch
@@ -0,0 +1,25 @@
+commit 0e33a46a1a15c60b6e736122d36c44bbe0a15789
+Author: Marti Maria <info@littlecms.com>
+Date:   Tue Jun 28 18:26:59 2011 +0200
+
+    Some architecturees does need aligned bus adresses (sparc) Fixed
+
+diff --git a/testbed/testcms2.c b/testbed/testcms2.c
+index 9a96d17..13fd7fc 100644
+--- a/testbed/testcms2.c
++++ b/testbed/testcms2.c
+@@ -73,10 +73,10 @@ static cmsUInt32Number SingleHit, MaxAllocated=0, TotalMemory=0;
+ // I'm hidding the size before the block. This is a well-known technique and probably the blocks coming from
+ // malloc are built in a way similar to that, but I do on my own to be portable.
+ typedef struct { 
+-    cmsUInt32Number KeepSize;
+-    cmsUInt32Number Align8;
+-    cmsContext WhoAllocated; // Some systems do need pointers aligned to 8-byte boundaries.
+-
++    cmsUInt32Number KeepSize;    
++    cmsContext      WhoAllocated; 
++    cmsUInt32Number Align8_1;             // Some systems do need pointers aligned to 8-byte boundaries.
++    cmsUInt32Number Align8_2;        
+ } _cmsMemoryBlock;
+ 
+ #define SIZE_OF_MEM_HEADER (sizeof(_cmsMemoryBlock))
diff --git a/media-libs/lcms/lcms-2.2-r1.ebuild b/media-libs/lcms/lcms-2.2-r1.ebuild
index a5f9c2bf5187..2bd79db1a28c 100644
--- a/media-libs/lcms/lcms-2.2-r1.ebuild
+++ b/media-libs/lcms/lcms-2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.2-r1.ebuild,v 1.1 2011/06/12 16:41:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lcms/lcms-2.2-r1.ebuild,v 1.2 2011/08/12 18:26:05 slyfox Exp $
 
 EAPI=4
 inherit eutils
@@ -24,7 +24,8 @@ S=${WORKDIR}/lcms2-${PV}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-header.patch \
-		"${FILESDIR}"/${P}-lm.patch
+		"${FILESDIR}"/${P}-lm.patch \
+		"${FILESDIR}"/${P}-fix-test-on-sparc.patch
 }
 
 src_configure() {