Fix for gcc-4.3.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

4 files changed, 73 insertions, 2 deletions

diff --git a/media-libs/openexr_ctl/ChangeLog b/media-libs/openexr_ctl/ChangeLog
index 5e51f4d1082b..02c3dee32e32 100644
--- a/media-libs/openexr_ctl/ChangeLog
+++ b/media-libs/openexr_ctl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openexr_ctl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/ChangeLog,v 1.13 2008/04/13 10:51:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/ChangeLog,v 1.14 2008/06/28 21:35:35 loki_val Exp $
+
+  28 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/openexr_ctl-1.0.1-configure_gcc43.patch,
+  +files/openexr_ctl-1.0.1-gcc43.patch, openexr_ctl-1.0.1.ebuild:
+  Fix for gcc-4.3.
 
   13 Apr 2008; Markus Rothe <corsair@gentoo.org> openexr_ctl-1.0.1.ebuild:
   Stable on ppc64; bug #207663
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch
new file mode 100644
index 000000000000..604d4237458d
--- /dev/null
+++ b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-configure_gcc43.patch
@@ -0,0 +1,22 @@
+diff -up openexr_ctl-1.0.1/configure.conf_gcc43 openexr_ctl-1.0.1/configure
+--- openexr_ctl-1.0.1/configure.conf_gcc43	2008-01-09 17:08:57.000000000 +0100
++++ openexr_ctl-1.0.1/configure	2008-01-09 17:10:25.000000000 +0100
+@@ -20851,6 +20851,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #include <CtlSimdInterpreter.h>
+ #include <Iex.h>
++#include <cstdlib>
+ 
+ int
+ main ()
+diff -up openexr_ctl-1.0.1/configure.ac.conf_gcc43 openexr_ctl-1.0.1/configure.ac
+--- openexr_ctl-1.0.1/configure.ac.conf_gcc43	2008-01-09 17:11:25.000000000 +0100
++++ openexr_ctl-1.0.1/configure.ac	2008-01-09 17:12:17.000000000 +0100
+@@ -108,6 +108,7 @@ AM_COMPILELINKRUN(
+    [$CTL_LIBS],[[
+ #include <CtlSimdInterpreter.h>
+ #include <Iex.h>
++#include <cstdlib>
+ ]],
+    [[Ctl::SimdInterpreter interp; interp.setMaxInstCount(10);]],
+    AC_MSG_RESULT([The ctl test program succeeded.]), 
diff --git a/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch
new file mode 100644
index 000000000000..349d4f083ca6
--- /dev/null
+++ b/media-libs/openexr_ctl/files/openexr_ctl-1.0.1-gcc43.patch
@@ -0,0 +1,34 @@
+diff -up openexr_ctl-1.0.1/exrdpx/main.cpp.gcc43 openexr_ctl-1.0.1/exrdpx/main.cpp
+--- openexr_ctl-1.0.1/exrdpx/main.cpp.gcc43	2007-07-25 08:28:17.000000000 +0200
++++ openexr_ctl-1.0.1/exrdpx/main.cpp	2008-01-08 20:27:14.000000000 +0100
+@@ -60,6 +60,8 @@
+ #include <iostream>
+ #include <string>
+ #include <exception>
++#include <cstdlib>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace Imf;
+diff -up openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp.gcc43 openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp
+--- openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp.gcc43	2008-01-08 20:30:30.000000000 +0100
++++ openexr_ctl-1.0.1/exr_ctl_exr/applyCtl.cpp	2008-01-08 20:33:02.000000000 +0100
+@@ -64,6 +64,7 @@
+ #include <iostream>
+ #include <vector>
+ #include <string>
++#include <cstdlib>
+ 
+ using namespace std;
+ using namespace Ctl;
+diff -up openexr_ctl-1.0.1/exr_ctl_exr/main.cpp.gcc43 openexr_ctl-1.0.1/exr_ctl_exr/main.cpp
+--- openexr_ctl-1.0.1/exr_ctl_exr/main.cpp.gcc43	2008-01-08 20:34:32.000000000 +0100
++++ openexr_ctl-1.0.1/exr_ctl_exr/main.cpp	2008-01-08 20:35:10.000000000 +0100
+@@ -59,6 +59,7 @@
+ #include <iostream>
+ #include <string>
+ #include <exception>
++#include <cstdlib>
+ #include <ImfFloatAttribute.h>
+ #include <ImfVecAttribute.h>
+ 
diff --git a/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild b/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild
index d29b23d752c3..6c7b7a824431 100644
--- a/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild
+++ b/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild,v 1.8 2008/04/13 10:51:08 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr_ctl/openexr_ctl-1.0.1.ebuild,v 1.9 2008/06/28 21:35:35 loki_val Exp $
+
+inherit eutils autotools
 
 DESCRIPTION="OpenEXR CTL libraries"
 HOMEPAGE="http://sourceforge.net/projects/ampasctl"
@@ -17,6 +19,14 @@ RDEPEND="media-libs/ilmbase
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-configure_gcc43.patch
+	eautoreconf
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README