Fix building with GCC 4.4+ wrt #282788.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 32 insertions, 27 deletions

diff --git a/media-gfx/openexr_viewers/ChangeLog b/media-gfx/openexr_viewers/ChangeLog
index 4fabde10a9d0..0df513a2c3dc 100644
--- a/media-gfx/openexr_viewers/ChangeLog
+++ b/media-gfx/openexr_viewers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/openexr_viewers
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.16 2008/11/14 18:58:58 coldwind Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.17 2009/08/26 10:21:50 ssuominen Exp $
+
+  26 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
+  openexr_viewers-1.0.1.ebuild, +files/openexr_viewers-1.0.1-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #282788.
 
   14 Nov 2008; Santiago M. Mola <coldwind@gentoo.org>
   openexr_viewers-1.0.1.ebuild:
diff --git a/media-gfx/openexr_viewers/Manifest b/media-gfx/openexr_viewers/Manifest
index e0cdb6d7b6ba..ee463c6f4870 100644
--- a/media-gfx/openexr_viewers/Manifest
+++ b/media-gfx/openexr_viewers/Manifest
@@ -1,6 +1,7 @@
 AUX openexr_viewers-1.0.0-nvidia-automagic.patch 685 RMD160 0055431676c8bebf943bc15a7f1046d6e5063e2e SHA1 c2a7305a45f01c866d8fa35f911dbe646e3355cc SHA256 9ac7325a4f0cb07c441ae66a2ef3c9c589a2a41e93fb8799e4e16c8841acae3b
 AUX openexr_viewers-1.0.1-gcc43.patch 2122 RMD160 2d45255837fc22a24462bf468fbe95ffd59f04bd SHA1 94c81b3931410c30cab0b5c5f6795ac74507634b SHA256 2327ca9369c9022a5f8f315d1d2a95037dcbfd610eee3dda22e11877205bd3bb
+AUX openexr_viewers-1.0.1-gcc44.patch 457 RMD160 7dc7537a50bca69ecc276ef59bec4b64525e08ab SHA1 1bf3a8d7278b7fcb67dd3c39749878b5b6a8c8d2 SHA256 7ffe124aa35eac56f142278b3e7639c892cf443cb9587d56ee59ef182cf551b6
 DIST openexr_viewers-1.0.1.tar.gz 471310 RMD160 857eab84a7236554afd46e3ab774bf89141ccbbd SHA1 8c157dd486c7bb63e06a5569f9c7bae9a2aa0d58 SHA256 e6550f96222ed5b96cf79d5951c3c27893708f3b608bc9c34784eb731b5bb8f0
-EBUILD openexr_viewers-1.0.1.ebuild 1518 RMD160 c147a42842560b771b7ec3d081762e93b469fac7 SHA1 46358940bbbb24887d34af774ea896d74ed3b2b8 SHA256 433f4896c0a868d775b2892a1ef34bb6aa80d0fd06d4060022b736501d3d57fb
-MISC ChangeLog 2369 RMD160 a59aaaf7be81ddc5ce140dcdd7ad85177389e334 SHA1 a23b4e8190da75f5a7f41a79fe0eed835f520653 SHA256 5a5af95b26d832081fe7f7513e9db192acef0affb03141adfaa5401a725337cf
+EBUILD openexr_viewers-1.0.1.ebuild 1342 RMD160 3d2f0b9611341093ae3db850964bd76c2e6b8af9 SHA1 448b54d33dd1d1b4c32a6f37b090d93853ba463c SHA256 8cf58f0572761c1002f3f5674dd70163e238c0b0dca87d5657643031d0c5dbaa
+MISC ChangeLog 2541 RMD160 2f43b64f0d64d19124865da29a4fc70afdc25b24 SHA1 bda27e0f390695ee110ef5f22011c0ade7f8b522 SHA256 aa643afc0b66b5747af7ec7ffc994f85dd344313ac3cc74904f17f3c720bc0ef
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
new file mode 100644
index 000000000000..3623de39ecd6
--- /dev/null
+++ b/media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch
@@ -0,0 +1,11 @@
+diff -ur openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp
+--- openexr_viewers-1.0.1.orig/exrdisplay/applyCtl.cpp	2007-07-26 04:38:21.000000000 +0300
++++ openexr_viewers-1.0.1/exrdisplay/applyCtl.cpp	2009-08-26 13:17:37.000000000 +0300
+@@ -39,6 +39,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <applyCtl.h>
++#include <stdio.h>
+ 
+ #if HAVE_CTL_INTERPRETER
+ 
diff --git a/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild b/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
index b0583f18fe8d..69a04b46ba5d 100644
--- a/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
+++ b/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild
@@ -1,59 +1,48 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild,v 1.11 2008/11/14 18:58:58 coldwind Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/openexr_viewers-1.0.1.ebuild,v 1.12 2009/08/26 10:21:50 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="OpenEXR Viewers"
 SRC_URI="http://download.savannah.nongnu.org/releases/openexr/${P}.tar.gz"
 HOMEPAGE="http://openexr.com/"
 
-SLOT="0"
 LICENSE="BSD"
+SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="doc opengl ${IUSE_VIDEO_CARDS}"
+IUSE="doc opengl video_cards_nvidia"
 
 RDEPEND="media-libs/ilmbase
 	media-libs/openexr
 	media-libs/ctl
 	media-libs/openexr_ctl
 	opengl? ( virtual/opengl
-		>=x11-libs/fltk-1.1.0:1.1
+		>=x11-libs/fltk-1.1.0:1.1[opengl]
 		video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) )"
 DEPEND="${RDEPEND}
 	!<media-libs/openexr-1.5.0
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	if use opengl && ! built_with_use x11-libs/fltk opengl ; then
-		die "You need OpenGL support in FLTK"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-1.0.0-nvidia-automagic.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.0-nvidia-automagic.patch \
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 	AT_M4DIR="m4" eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_with opengl fltk-config /usr/bin/fltk-config) \
 		$(use_enable video_cards_nvidia nvidia)
-	emake || die "emake failed"
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README
 
-	if use doc ; then
+	if use doc; then
 		insinto "/usr/share/doc/${PF}"
 		doins doc/*.pdf
 	fi