summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-15 20:37:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-15 20:37:50 +0000
commitf8805eec2f61dfabda649d985a3e60eb06727812 (patch)
treea5855d0e54620430daa5d10fb736b6c8509781cc /media-gfx/openexr_viewers
parentClean some versions, EAPI2, fix Gnome start command for bug #292480 (diff)
downloadgentoo-2-f8805eec2f61dfabda649d985a3e60eb06727812.tar.gz
gentoo-2-f8805eec2f61dfabda649d985a3e60eb06727812.tar.bz2
gentoo-2-f8805eec2f61dfabda649d985a3e60eb06727812.zip
Update GCC 4.4 patch to include also applyCtl.cpp wrt #296912.
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/openexr_viewers')
-rw-r--r--media-gfx/openexr_viewers/ChangeLog6
-rw-r--r--media-gfx/openexr_viewers/files/openexr_viewers-1.0.1-gcc44.patch40
2 files changed, 38 insertions, 8 deletions
diff --git a/media-gfx/openexr_viewers/ChangeLog b/media-gfx/openexr_viewers/ChangeLog
index 0df513a2c3dc..7d21f441d929 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openexr_viewers/ChangeLog,v 1.18 2009/12/15 20:37:49 ssuominen Exp $
+
+ 15 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+ files/openexr_viewers-1.0.1-gcc44.patch:
+ Update GCC 4.4 patch to include also applyCtl.cpp wrt #296912.
26 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
openexr_viewers-1.0.1.ebuild, +files/openexr_viewers-1.0.1-gcc44.patch:
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
index 3623de39ecd6..4ab58548d71a 100644
--- 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
@@ -1,11 +1,37 @@
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 @@
- //-----------------------------------------------------------------------------
+--- playexr/ctlToLut.cpp.orig 2009-12-14 09:07:00.863493115 -0800
++++ playexr/ctlToLut.cpp 2009-12-14 09:08:16.721186947 -0800
+@@ -49,6 +49,7 @@
+ #include <ImfFrameBuffer.h>
+ #include <cassert>
+ #include <iostream>
++ #include <cstdio>
- #include <applyCtl.h>
-+#include <stdio.h>
+ using namespace std;
+ using namespace Ctl;
+@@ -61,6 +62,7 @@
+ #include <ImfHeader.h>
+ #include <cassert>
+ #include <iostream>
++ #include <cstdio>
- #if HAVE_CTL_INTERPRETER
+ using namespace std;
+ using namespace Imf;
+--- exrdisplay/applyCtl.cpp.orig 2009-12-14 09:11:44.950334079 -0800
++++ exrdisplay/applyCtl.cpp 2009-12-14 09:11:59.900332294 -0800
+@@ -49,6 +49,7 @@
+ #include <ImfFrameBuffer.h>
+ #include <cassert>
+ #include <iostream>
++ #include <cstdio>
+ using namespace std;
+ using namespace Ctl;
+@@ -61,6 +62,7 @@
+ #include <ImfHeader.h>
+ #include <cassert>
+ #include <iostream>
++ #include <cstdio>
+
+ using namespace std;
+ using namespace Imf;