Fix for gcc-4.3.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 77 insertions, 4 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/Manifest b/media-libs/openexr_ctl/Manifest
index 1442f53b08fe..a8bc2a3d3efb 100644
--- a/media-libs/openexr_ctl/Manifest
+++ b/media-libs/openexr_ctl/Manifest
@@ -1,6 +1,8 @@
+AUX openexr_ctl-1.0.1-configure_gcc43.patch 858 RMD160 2caacf417d802da9e94b11ea5b34a6e41522af7f SHA1 ea3074a15ad2bf948e4cdea3f64e3a73ed138c8c SHA256 cd844d136c5e2e41aa89f5d7860dbc74aa0f8602d7307f7af30fbb1ccc7fcb28
+AUX openexr_ctl-1.0.1-gcc43.patch 1240 RMD160 a1d736312084e14609b09766491e255b853e68bc SHA1 70639d512eff974a20cf098e7daa791db8975a94 SHA256 f07d13959b92089c5eb54a0f08f33a46f314cdb1a6fa6600b132ace6fe167513
 DIST openexr_ctl-1.0.0.tar.gz 367164 RMD160 51614a69bc6b24be05a2e5de581d5cf0e85adbf8 SHA1 9888a14b5b6c997e0a3859dd2c7c422d7cdcfbd0 SHA256 bfa28d626201f6b29e794b9ab54a01ec4b1153ec99160b492adabf0ae082f304
 DIST openexr_ctl-1.0.1.tar.gz 362864 RMD160 f95cb574ef8e47541d53c3919d7237de12c7cb7c SHA1 330839a3af4069d67292dd86cb9c2512d08bb8af SHA256 2d88d624e24fce64ee8494d4dd46e33684f93941e1ca46024554d1ab6ed5e9c9
 EBUILD openexr_ctl-1.0.0.ebuild 675 RMD160 7965ddecf4b7ede9cebe3e3786ce1ce0d6800a14 SHA1 1452287b566c1170ce9e75c2d8fdd66f71ff8cf4 SHA256 9b66300f8d9636b7b2ee50a9b4ff4009e4ed72107c9f8e15a94e096f651f7d4d
-EBUILD openexr_ctl-1.0.1.ebuild 674 RMD160 3d7838413a170e0116b4184368e7b775c8125c2d SHA1 b8d4ca9bbb094ab1297b3175ebecce78892ff1ff SHA256 4302d92e9ea8eb4358f4738732483da2962a4c106a176862cf297b946570b1d8
-MISC ChangeLog 1843 RMD160 80bbe73d3321abbee8fae5b44cccf397fbcf0d27 SHA1 0b27d3050728036f4586a7bb30e28dcf9d737f28 SHA256 46afe6724ddf6ddb1f690ee6fc9fdcbaff96b6a65267b0ecfa6b877a6694cdd3
+EBUILD openexr_ctl-1.0.1.ebuild 844 RMD160 99f047b260da0d47c687eb4b04990701907d3592 SHA1 0c7de9da58bd9a788c22ee7d5bd0e750f354a603 SHA256 e8e54b4da49b1e0e3c619d56f2e54661e6688f06af2d39992c290d959b478683
+MISC ChangeLog 2033 RMD160 6bdd32a327530008efa1554ab8f014029515630e SHA1 0f3910826c7a794f840bb48a34458ea7abdae9a5 SHA256 72fb3842c1e056f87de43c994ad383e7321042c06b1857b51fdcc001094a4f7c
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
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