diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-12 18:26:05 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2011-08-12 18:26:05 +0000 |
| commit | c58b70a64c8f0806f8e588ad1b54d1e67a1ba9da (patch) | |
| tree | 292dc0cbb5fecf725193417b46d8afc365b41e1a /media-libs/lcms | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c58b70a64c8f0806f8e588ad1b54d1e67a1ba9da.tar.gz gentoo-2-c58b70a64c8f0806f8e588ad1b54d1e67a1ba9da.tar.bz2 gentoo-2-c58b70a64c8f0806f8e588ad1b54d1e67a1ba9da.zip | |
Fix FEATURES=test SIGBUS failure on sparc32. bug #371525 by Matt Turner, patch is from upstream.
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/lcms')
| -rw-r--r-- | media-libs/lcms/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/lcms/files/lcms-2.2-fix-test-on-sparc.patch | 25 | ||||
| -rw-r--r-- | media-libs/lcms/lcms-2.2-r1.ebuild | 5 |
3 files changed, 34 insertions, 3 deletions
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/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() { |