summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-07-21 14:21:55 +0000
committerJeroen Roovers <jer@gentoo.org>2013-07-21 14:21:55 +0000
commitbfe819cb6170b53c52d3578b10dd4b5b63eb79db (patch)
tree0f30571bbe0db29a6026b4f020f0b1e649a434c3 /media-gfx
parentRemove patches that have been applied upstream. (diff)
downloadgentoo-2-bfe819cb6170b53c52d3578b10dd4b5b63eb79db.tar.gz
gentoo-2-bfe819cb6170b53c52d3578b10dd4b5b63eb79db.tar.bz2
gentoo-2-bfe819cb6170b53c52d3578b10dd4b5b63eb79db.zip
Fix building on HPPA (bug #438608).
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/graphicsmagick/ChangeLog6
-rw-r--r--media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch11
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild3
3 files changed, 18 insertions, 2 deletions
diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index fbdecccf835b..ff9c82beb9ad 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/graphicsmagick
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.112 2013/07/21 13:06:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.113 2013/07/21 14:21:55 jer Exp $
+
+ 21 Jul 2013; Jeroen Roovers <jer@gentoo.org> graphicsmagick-1.3.18.ebuild,
+ +files/graphicsmagick-1.3.18-powerpc.patch:
+ Fix building on HPPA (bug #438608).
21 Jul 2013; Agostino Sarubbo <ago@gentoo.org> graphicsmagick-1.3.18.ebuild:
Stable for amd64, wrt bug #477606
diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
new file mode 100644
index 000000000000..30a67fdc3e2d
--- /dev/null
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
@@ -0,0 +1,11 @@
+--- a/magick/studio.h
++++ b/magick/studio.h
+@@ -51,7 +51,7 @@
+ threads. Most CPUs have cache lines of 32 or 64 bytes. IBM Power CPUs have
+ cache lines of 128 bytes.
+ */
+-#if defined(MAGICK_TARGET_CPU) && (MAGICK_TARGET_CPU == powerpc)
++#ifdef __powerpc__
+ # define MAGICK_CACHE_LINE_SIZE 128
+ #else
+ # define MAGICK_CACHE_LINE_SIZE 64
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
index e7617068d21a..27e0c1783585 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.3 2013/07/21 13:06:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.18.ebuild,v 1.4 2013/07/21 14:21:55 jer Exp $
EAPI=5
inherit toolchain-funcs eutils
@@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.3.18-freetype.patch
+ epatch "${FILESDIR}"/${PN}-1.3.18-powerpc.patch
}
src_configure() {