add a patch by Ryan Hill <dirtyepic@gentoo.org> to fix build with gcc 4.3, bug #212435

Package-Manager: portage-2.1.4.4

diff --git a/media-libs/openexr/ChangeLog b/media-libs/openexr/ChangeLog
index 422d6abf0e286216a9dc08569892a30920390f71..cda44e9621713fdb3fb520bd7f1334f9f20f9f57 100644 (file)
--- a/media-libs/openexr/ChangeLog
+++ b/media-libs/openexr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/openexr
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.72 2008/01/31 18:48:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/ChangeLog,v 1.73 2008/03/05 22:50:58 aballier Exp $
+
+  05 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/openexr-1.6.1-gcc-4.3.patch, openexr-1.6.1.ebuild:
+  add a patch by Ryan Hill <dirtyepic@gentoo.org> to fix build with gcc 4.3,
+  bug #212435
 
   31 Jan 2008; nixnut <nixnut@gentoo.org> openexr-1.6.1.ebuild:
   Stable on ppc wrt bug 207663

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index a636d56581037a45ca740e8ab48902382027669b..33e6f8abfab9adcc90cf9cbbd44afea30e541f65 100644 (file)
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openexr-1.2.2-asneeded.patch 2026 RMD160 84bb005d5e0b7d0a9fc2c47d12da6933bd86aa37 SHA1 1667069fde9e997af59b9247b2e4b16b91ba9ca1 SHA256 e5802aa3563d49625bfa785a43dd3282beedd0d6c332a6af2582e0e18a077939
 AUX openexr-1.2.2-gcc4.patch 311 RMD160 d119ca7f5338205e424b221cbd19ff9a6864b808 SHA1 d4588b325b4ae5b2b06105c1466530632f200c25 SHA256 b1bd567b9ae8c1f3124ae3c275d6c1624e09e523de01210a6c0538dee7d2ec58
 AUX openexr-1.4.0a-asneeded.patch 427 RMD160 37d2949adb7a05006d536be08a7ba64de6e305cd SHA1 b63fdc2492a5bedb2b50f71b8bc4ae771356fcaf SHA256 682a3b5d84444182cd7e96997cc5d4321a46dcb21d945d1ee94ed7ecc590dd39
 AUX openexr-1.4.0a-nvidia-automagic.patch 685 RMD160 0055431676c8bebf943bc15a7f1046d6e5063e2e SHA1 c2a7305a45f01c866d8fa35f911dbe646e3355cc SHA256 9ac7325a4f0cb07c441ae66a2ef3c9c589a2a41e93fb8799e4e16c8841acae3b
+AUX openexr-1.6.1-gcc-4.3.patch 780 RMD160 9a339b48b92cd9fe6f4b5a312e4522c6838ee3be SHA1 ea73ace41a7dcaf4ea6d5b7d50df41acb6ae4cd5 SHA256 096e6c4d552775c11caec857a5940e9b7bdf6998214101b3d071885c793a9e32
 DIST OpenEXR-1.2.2.tar.gz 9324108 RMD160 54ceab6aa7a848f28a4cbd6cd63ab4023e3e372c SHA1 8ee37cd2a95b8561a4c850cc35781dec87b77bbf SHA256 77e6e93cb40d5f6d69b26c05ca9738cdcc3978753e0053c9115026d7adaefc8d
 DIST openexr-1.4.0a.tar.gz 9673041 RMD160 74e43977c88fc9a3d7c74bcd808a477489dad8c2 SHA1 d7f2188b677ea28cafb104f2ace6c0f50b5aadee SHA256 5d8a7327bd28eeb5d3064640d8eb32c3cd8c5a15999c70b0afa9f8af851936d1
 DIST openexr-1.6.0.tar.gz 13629247 RMD160 a33fc4d9f1d5c4e8137aa5eb6952ca4f8880a6e7 SHA1 fd2cc0ceb19f1567e30f88f9469c457d619c1232 SHA256 043bcbb2829e51ac09018226d86bc036f14d716e5096ac067946c835b7e2eb57
@@ -9,6 +13,13 @@ DIST openexr-1.6.1.tar.gz 13632660 RMD160 3670633be841628e9d4c11981661e9d94a9b27
 EBUILD openexr-1.2.2-r2.ebuild 1510 RMD160 fa266f3f2fbdf0e3be76ee0c134c6535a865ef67 SHA1 625a288df800831641a4210ae435d3f44403d8d4 SHA256 030f3aad3fe23e252f89f038b20354d34f685204ca0beace4352df53d210bcd1
 EBUILD openexr-1.4.0a.ebuild 1789 RMD160 493537bb4a94a6dbec8767660f5482c6cccbecd4 SHA1 6f7711f982070dae748e71c2fd8a7a40628240fe SHA256 42ceb9f857e7c94f868073bcd0ea5aa6246f56a278e0a8d982c9794c0ab3447c
 EBUILD openexr-1.6.0.ebuild 1718 RMD160 56368ca668a3bf57dd2c50bb9d8645020468e1ce SHA1 3910c7cdc7391dad84254c1acbceffe4381fd10d SHA256 89c834af6ec1c01145c7305a08d3e78cff7bac6a42a4d40b6cf172934e551b14
-EBUILD openexr-1.6.1.ebuild 1708 RMD160 23616b889481fd0886748ba2a2abbfbb667276c5 SHA1 c0c3caacca84d4bc38284067aa8005c730a57288 SHA256 5543366d8bd66c86f645948659014220df532748aedb231f96568d4885de688e
-MISC ChangeLog 9247 RMD160 936be20ece8c95b2babf2763b2edeb364c2ea5f4 SHA1 72ebf7101873605eb7cbc7e48a26b45dbca74b22 SHA256 8baac31e415bffc737f4631be98bca8120311101aa5e628af4bf6507dd7ca8b2
+EBUILD openexr-1.6.1.ebuild 1759 RMD160 3c223b6102830907b548a327f3a3db1a1deeda30 SHA1 e2c4ad9711fd97ecf00140a7c8cc5bf95c5ee982 SHA256 8f07a61695b415b41c8222a4b58bff57b6842cc55b8e89715479dc236a599c1f
+MISC ChangeLog 9453 RMD160 f6d778d22489030818c74365fa8b5c393ec418ba SHA1 79dc3373cfd5e45de795e3ee56dd7db3de0641ee SHA256 e57940d6692c7d6e40ea2d7bcc4402ed52bb29dd9256549852b8e6c3237bc65f
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzyPhvFcC4BYPU0oRAhqjAJ9Y6Di/xOGQjiHP9+Bi0wc90GD4bQCfTjen
+SHjY5O0SAfNkgHUvsCngoQc=
+=1TJD
+-----END PGP SIGNATURE-----

diff --git a/media-libs/openexr/files/openexr-1.6.1-gcc-4.3.patch b/media-libs/openexr/files/openexr-1.6.1-gcc-4.3.patch
new file mode 100644 (file)
index 0000000..f5fa837
--- /dev/null
+++ b/media-libs/openexr/files/openexr-1.6.1-gcc-4.3.patch
@@ -0,0 +1,22 @@
+diff -Naur openexr-1.6.1-orig/exrenvmap/main.cpp openexr-1.6.1/exrenvmap/main.cpp
+--- openexr-1.6.1-orig/exrenvmap/main.cpp      2007-04-24 19:07:51.000000000 -0600
++++ openexr-1.6.1/exrenvmap/main.cpp   2008-01-12 20:28:56.000000000 -0600
+@@ -43,6 +43,7 @@
+ #include <makeLatLongMap.h>
+ #include <ImfEnvmap.h>
+ #include <iostream>
++#include <cstring>
+ #include <exception>
+ #include <stdlib.h>
+ 
+diff -Naur openexr-1.6.1-orig/exrmaketiled/main.cpp openexr-1.6.1/exrmaketiled/main.cpp
+--- openexr-1.6.1-orig/exrmaketiled/main.cpp   2007-04-24 19:08:45.000000000 -0600
++++ openexr-1.6.1/exrmaketiled/main.cpp        2008-01-12 20:28:14.000000000 -0600
+@@ -45,6 +45,7 @@
+ #include <iostream>
+ #include <exception>
+ #include <string>
++#include <cstring>
+ #include <stdlib.h>
+ 
+ using namespace Imf;

diff --git a/media-libs/openexr/openexr-1.6.1.ebuild b/media-libs/openexr/openexr-1.6.1.ebuild
index f287e69162e354f85623159321e85fb397faff90..8f843862fa99027296d88bd5bb4d866ec510c158 100644 (file)
--- a/media-libs/openexr/openexr-1.6.1.ebuild
+++ b/media-libs/openexr/openexr-1.6.1.ebuild
@@ -1,8 +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/openexr-1.6.1.ebuild,v 1.8 2008/01/31 18:48:46 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openexr/openexr-1.6.1.ebuild,v 1.9 2008/03/05 22:50:58 aballier Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
 HOMEPAGE="http://openexr.com/"
@@ -24,6 +24,8 @@ src_unpack() {
        # Replace the temporary directory used for tests.
        sed -i -e 's:"/var/tmp/":"'${T}'":' "IlmImfTest/tmpDir.h"
 
+       epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+
        # Sane versioning on FreeBSD - please don't remove elibtoolize
        elibtoolize
 }