summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-01-22 20:16:27 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-01-22 20:16:27 +0000
commit107f6b5cfedd0423c8d301a034c180c195e76b3a (patch)
treea8661fd069297e5950479f5435ae6e9d4ff082a0
parentVersion bump wrt bug #399759. (diff)
downloadgentoo-2-107f6b5cfedd0423c8d301a034c180c195e76b3a.tar.gz
gentoo-2-107f6b5cfedd0423c8d301a034c180c195e76b3a.tar.bz2
gentoo-2-107f6b5cfedd0423c8d301a034c180c195e76b3a.zip
Fix building with media-libs/tiff >= 4.0.0_pre wrt #319383 by Helmut Jarausch
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
-rw-r--r--media-gfx/xloadimage/ChangeLog8
-rw-r--r--media-gfx/xloadimage/xloadimage-4.1-r11.ebuild10
2 files changed, 13 insertions, 5 deletions
diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog
index 7b158d6e630e..cc2a253582e6 100644
--- a/media-gfx/xloadimage/ChangeLog
+++ b/media-gfx/xloadimage/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/xloadimage
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.64 2011/11/05 04:31:06 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.65 2012/01/22 20:16:27 ssuominen Exp $
+
+ 22 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+ xloadimage-4.1-r11.ebuild:
+ Fix building with media-libs/tiff >= 4.0.0_pre wrt #319383 by Helmut Jarausch
23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
-xloadimage-4.1-r10.ebuild:
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
index a02bbdb75dcc..ba0238ed2df0 100644
--- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
+++ b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.11 2011/10/23 15:49:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.12 2012/01/22 20:16:27 ssuominen Exp $
EAPI=2
-inherit autotools eutils toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
DESCRIPTION="utility to view many different types of images under X11"
HOMEPAGE="http://world.std.com/~jimf/xloadimage.html"
@@ -59,6 +59,10 @@ src_prepare() {
}
src_configure() {
+ # Set TIFFHeader to TIFFHeaderCommon wrt #319383
+ has_version '>=media-libs/tiff-4.0.0_pre' && \
+ append-flags -DTIFFHeader=TIFFHeaderCommon
+
tc-export CC
econf $(use_with jpeg) \
$(use_with png) \