Fix gcc-4.3 compilation. Thanks to Robert Piasek <robert.piasek@member.fsf.org> in bug 227395 for the first part of the patch.

Package-Manager: portage-2.1.5.5

4 files changed, 128 insertions, 4 deletions

diff --git a/media-libs/ctl/ChangeLog b/media-libs/ctl/ChangeLog
index 172365211d9b..762fb8159788 100644
--- a/media-libs/ctl/ChangeLog
+++ b/media-libs/ctl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/ctl
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ctl/ChangeLog,v 1.13 2008/04/13 10:49:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ctl/ChangeLog,v 1.14 2008/06/20 19:46:06 loki_val Exp $
+
+  20 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/ctl-1.4.1-gcc43.patch, ctl-1.4.1.ebuild:
+  Fix gcc-4.3 compilation. Thanks to Robert Piasek
+  <robert.piasek@member.fsf.org> in bug 227395 for the first part of the
+  patch.
 
   13 Apr 2008; Markus Rothe <corsair@gentoo.org> ctl-1.4.1.ebuild:
   Stable on ppc64; bug #207663
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index b489cdea9342..55f148c0972e 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,6 +1,7 @@
+AUX ctl-1.4.1-gcc43.patch 4013 RMD160 335843d0bbf363f9e667ddf3eb95ee9a07adbfd1 SHA1 a6b10006368771a020852eb9367198fc0fd159eb SHA256 17ab8175caa3f74e7e05bc4d2665fd461d872ccef266f7df7858b75821b69b91
 DIST ctl-1.4.0.tar.gz 1004039 RMD160 759900dd9a85329b32caf8a8be105570782b0642 SHA1 90b4bf44fa0f327e908f5aa4181e787e3e98ebe2 SHA256 85cc710d18f1ac16e77640e165ba083c6e27766cbe6b0cfdb80eac3daef58aa6
 DIST ctl-1.4.1.tar.gz 996923 RMD160 0069e2f132cc9261a65beaa2db4d952409f622b1 SHA1 4e31de8e8da144bbc840d97014a8f45e20e398ac SHA256 b202d9552eeb81f3ded66a6786719f6e1138fa4e31c866799b1efad6ef7a9f9a
 EBUILD ctl-1.4.0.ebuild 750 RMD160 fa0b87e9e9c46a150618a9095798f2c3cbb78d12 SHA1 23f1a665f5bb3ed28cc828963aca2f0825f0c791 SHA256 274a88ecdd68dcbcb7658a1e15ac6225126985abe0d21b6da74493abea7f47b4
-EBUILD ctl-1.4.1.ebuild 749 RMD160 8546ff168de28354b0ec5124af01776dcdde4372 SHA1 dbc3ac49f98ec9e488fe1e95246c1f3165f115d9 SHA256 ea57aef270e5be4a10fadd6faaee47771f6f7297d7dd1be9a3ddc812755c5f07
-MISC ChangeLog 1693 RMD160 f314f29cf9525f664d2e1a46fac5a8f3166a3aec SHA1 282a800bca284da1c63a242c75d9c8dc16344247 SHA256 1bc5b655b78a8daf732324156319a84056279f561260df8417fc59b1578c54ce
+EBUILD ctl-1.4.1.ebuild 808 RMD160 e05652470bb56f397fa7427b287f73cd8149d33c SHA1 db033f2e9ab35c4ba42c090024c26f87dfa2647d SHA256 0d0e68d541fef09203898f8e1ad397de0bf8dc142d4507b8370869faae9f2df2
+MISC ChangeLog 1931 RMD160 98ede6c2aebf0870845ab4539178fd85f702f34a SHA1 d84b021f224e618d0dc6bfa1aaa48d1ee080d328 SHA256 75662b7e0269df10ea0d1730323932744868f712ae5e92a37a3858a7a59beb9e
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
diff --git a/media-libs/ctl/ctl-1.4.1.ebuild b/media-libs/ctl/ctl-1.4.1.ebuild
index 66a83665f8c0..3f741f20f53b 100644
--- a/media-libs/ctl/ctl-1.4.1.ebuild
+++ b/media-libs/ctl/ctl-1.4.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/ctl/ctl-1.4.1.ebuild,v 1.8 2008/04/13 10:49:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ctl/ctl-1.4.1.ebuild,v 1.9 2008/06/20 19:46:06 loki_val Exp $
+
+inherit base
 
 DESCRIPTION="AMPAS' Color Transformation Language"
 HOMEPAGE="http://sourceforge.net/projects/ampasctl"
@@ -15,6 +17,8 @@ RDEPEND="media-libs/ilmbase"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS ChangeLog NEWS README
diff --git a/media-libs/ctl/files/ctl-1.4.1-gcc43.patch b/media-libs/ctl/files/ctl-1.4.1-gcc43.patch
new file mode 100644
index 000000000000..425ce1205054
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.4.1-gcc43.patch
@@ -0,0 +1,113 @@
+diff -NrU5 ctl-1.4.1.orig/IlmCtl/CtlLex.h ctl-1.4.1/IlmCtl/CtlLex.h
+--- ctl-1.4.1.orig/IlmCtl/CtlLex.h	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtl/CtlLex.h	2008-06-20 18:31:24.000000000 +0200
+@@ -58,10 +58,11 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include <CtlLContext.h>
+ #include <CtlTokens.h>
+ #include <string>
++#include <cstdlib>
+ 
+ namespace Ctl {
+ 
+ 
+ class Lex
+diff -NrU5 ctl-1.4.1.orig/IlmCtlMathTest/testAffineRec.cpp ctl-1.4.1/IlmCtlMathTest/testAffineRec.cpp
+--- ctl-1.4.1.orig/IlmCtlMathTest/testAffineRec.cpp	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlMathTest/testAffineRec.cpp	2008-06-20 18:37:21.000000000 +0200
+@@ -43,13 +43,14 @@
+ // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //
+ ///////////////////////////////////////////////////////////////////////////
+ 
+-#include <string>
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
++#include <cstdlib>
+ #include <assert.h>
+ #include <CtlRbfInterpolator.h>
+ #include <ImathVec.h>
+ 
+ using namespace std;
+diff -NrU5 ctl-1.4.1.orig/IlmCtlMathTest/testGaussRec.cpp ctl-1.4.1/IlmCtlMathTest/testGaussRec.cpp
+--- ctl-1.4.1.orig/IlmCtlMathTest/testGaussRec.cpp	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlMathTest/testGaussRec.cpp	2008-06-20 18:37:31.000000000 +0200
+@@ -43,13 +43,14 @@
+ // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //
+ ///////////////////////////////////////////////////////////////////////////
+ 
+-#include <string>
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
++#include <cstdlib>
+ #include <assert.h>
+ #include <CtlRbfInterpolator.h>
+ #include <ImathVec.h>
+ 
+ using namespace std;
+diff -NrU5 ctl-1.4.1.orig/IlmCtlSimd/CtlSimdReg.h ctl-1.4.1/IlmCtlSimd/CtlSimdReg.h
+--- ctl-1.4.1.orig/IlmCtlSimd/CtlSimdReg.h	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlSimd/CtlSimdReg.h	2008-06-20 18:31:24.000000000 +0200
+@@ -50,10 +50,11 @@
+ #define INCLUDED_CTL_SIMD_REG_H
+ 
+ #include <typeinfo>
+ #include <CtlExc.h>
+ #include <Iex.h>
++#include <cstring>
+ 
+ //-----------------------------------------------------------------------------
+ //
+ //	Registers for the SIMD color transformation engine
+ //
+diff -NrU5 ctl-1.4.1.orig/IlmCtlTest/testExamples.cpp ctl-1.4.1/IlmCtlTest/testExamples.cpp
+--- ctl-1.4.1.orig/IlmCtlTest/testExamples.cpp	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlTest/testExamples.cpp	2008-06-20 18:41:52.000000000 +0200
+@@ -43,10 +43,11 @@
+ // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ //
+ ///////////////////////////////////////////////////////////////////////////
+ 
++#include <cstring>
+ #include <CtlSimdInterpreter.h>
+ #include <CtlFunctionCall.h>
+ #include <CtlType.h>
+ #include <assert.h>
+ 
+diff -NrU5 ctl-1.4.1.orig/IlmCtlTest/testVarying.cpp ctl-1.4.1/IlmCtlTest/testVarying.cpp
+--- ctl-1.4.1.orig/IlmCtlTest/testVarying.cpp	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlTest/testVarying.cpp	2008-06-20 18:43:28.000000000 +0200
+@@ -49,10 +49,11 @@
+ #include <CtlSimdInterpreter.h>
+ #include <CtlFunctionCall.h>
+ #include <CtlType.h>
+ #include <ImathMath.h>
+ #include <iostream>
++#include <cstring>
+ #include <exception>
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
+ #include <half.h>
+diff -NrU5 ctl-1.4.1.orig/IlmCtlTest/testVaryingReturn.cpp ctl-1.4.1/IlmCtlTest/testVaryingReturn.cpp
+--- ctl-1.4.1.orig/IlmCtlTest/testVaryingReturn.cpp	2008-06-20 18:30:55.000000000 +0200
++++ ctl-1.4.1/IlmCtlTest/testVaryingReturn.cpp	2008-06-20 18:46:34.000000000 +0200
+@@ -49,10 +49,11 @@
+ #include <CtlSimdInterpreter.h>
+ #include <CtlFunctionCall.h>
+ #include <CtlType.h>
+ #include <ImathMath.h>
+ #include <iostream>
++#include <cstring>
+ #include <exception>
+ #include <assert.h>
+ #include <sstream>
+ #include <limits>
+ #include <half.h>