Fix building with sys-devel/gcc >= 4.6.0 wrt #452694 by Alexandre Borges Marcelo

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 52 insertions, 13 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 4af8d4895386..cce5565c9790 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/blender
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.242 2012/12/31 16:02:50 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.243 2013/01/17 16:52:21 ssuominen Exp $
+
+  17 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> blender-2.49b-r2.ebuild,
+  +files/blender-2.49b-gcc46.patch:
+  Fix building with sys-devel/gcc >= 4.6.0 wrt #452694 by Alexandre Borges
+  Marcelo
 
   31 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> -blender-2.63a-r2.ebuild,
   -blender-2.63a-r3.ebuild, blender-2.64a.ebuild:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 3b82588d30fe..7dd509dc016c 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -6,6 +6,7 @@ AUX blender-2.44-scriptsdir.patch 2586 SHA256 a7afac10ce2431cd94d10dc3f4cae33423
 AUX blender-2.48a-CVE-2008-4863.patch 696 SHA256 fee1896c791a623181ebf681f4ad67c610677e82575a95a46e896b747f980418 SHA512 9b466f00e548f135fd5013dc5b756556c7f4a2288916822110639c5a1cb8932b6f828edaf4731414670b415649cb06131fd9b488f82aae5ed8ecd40f8eb4ff1b WHIRLPOOL bcdd881c60ebd6325e0461cd9ee6f00f9bceb0fd34252e1819b166bce08105c2e0fce205ce272e9a26897ebf34f60a7f742d94b3dcb50a1698b27d408ac32ee2
 AUX blender-2.49a-sys-openjpeg.patch 452 SHA256 437f016b9f7c48281015838a22203c4db9ef6b62dac01aa86faa1c9793bff182 SHA512 ae30c35622908bf633af7f0491af716ed838a830214e7b6f9c6c014187984673e43de19c0d96a1395aa7902813fee2cdab209615f5210fbd70aff7a8a31370b4 WHIRLPOOL ab4b50c5a35d6d9e1d01f28000f349e5c452592aecc5e8d3194d04456abf4be2f32b13dffb7d1e325e0bdf1ff4ac8238c609c19a1b017c729c5bd1c9da193f49
 AUX blender-2.49b-CVE-2009-3850-v4.patch 5222 SHA256 0707904cd3b627cfeac19d4d775ee4a019ba395251c9318dbb356e3b8de19124 SHA512 83d639ab73c579dd7e202139696b9a9dd12cc1824218d04c5259dbb73fbc8b73dcc72d2a8032c2b954a10d3c4dd363ce15a10dec1017fcebc76237aa0e1984aa WHIRLPOOL a70a87aae3cd453e0b483f3dd6185a3391b6badd9810108ab9ab599e55b3dd0d10387d2174105249381e4b57e538748c05c9672abe13ea8646fab66a210f382e
+AUX blender-2.49b-gcc46.patch 854 SHA256 57661ab5bd4bc163a63e77ef4fcd9828a20b1fe48f269405e4696d544ae90fdc SHA512 9e4300dc327debebde7248e070ccd1b579b9ad0e37ae691d285f102b3708384158ff19ed5ad1ce63a9e2f234e4607739b2109cd89df8c3379ac09d0cf79e2ce0 WHIRLPOOL 9e83b6181f8a9bccd082d252402ef2ec5dd5606cfbc4bd9685fc69fd6798796c64d001e43a6fdcd8e21cdf2dbd468b1fc10b06bcaf07c230e440961ead4c45ae
 AUX blender-2.49b-insecure.desktop 223 SHA256 dfd0a438ebf792071fc9f12036f07b0f14277b2bf34050bf4d57ffceeff55555 SHA512 aa93dc9777ca08df7b44d6b637b5aa0514e5133bb330e245a8d975e31534a83ba5e991ad7e5b8122d163d0ac2416706a84acbbf8d60dfd84c589b0880b4a8e89 WHIRLPOOL b30b9a1de44c29b1fb244a2d5333f058f409f0db8d7f1af2935e07d6f02490ab149f34a75afdb504c1e896692ebd0e6dd4db7551e8d23ca7f818e5246f0b1422
 AUX blender-2.49b-libav-0.7.patch 15251 SHA256 636244001abc882887b7c72f665c751a86a96f355ec196a49390b8d13180cec5 SHA512 a1dfab93b6dab0424002fc9ed49de990d2ecb0814ed4c44b26484dfd3f3b3987cd2dae2514e6a68db6fec91f74924428ef79fd7514572e285caef03c0e5aeb06 WHIRLPOOL 6e126329a3ffd1f438853e1f9d5ef5c2684c667f4a9c19f49c2908492e05ec9802b6996972837ffac91c6690bc9ebfcb1dbc23c9dd048434c18d285fea6d7c1a
 AUX blender-2.49b-linux-3.patch 414 SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732 SHA512 2dc9b6e8599254e88aa1fa529c30a38247551c67ac6b393071e5226b6f3495d4a4a696f39741a23c75746132f8c012247cf434cf0d9ff546207c98b74ef4f3f8 WHIRLPOOL 8be68aff5a7e801eb4871ff5e62481bff18b92372268730fcc4236ff32a5795fcc699ae52262c09f196b30eeef85b4374416bd957fe589ebb925c16558db1353
@@ -14,18 +15,18 @@ AUX blender.desktop 199 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af
 DIST blender-2.49b.tar.gz 22918377 SHA256 23554db4aa10b00e0e760a8bf9c4a9f749670d815c8bc874a04746adc4752488 SHA512 0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460 WHIRLPOOL d8b54b39eb47841c7e93157726f55c855d0930b89e4cbe8f093dcd7110978ed267ca96517281861bd6d62c1108a8068c5a863452d3208b1f4ad3d374f1e74f7d
 DIST blender-2.64a-patches-1.tar.xz 14388 SHA256 047f3231f4b21dd813e7b052be0b28b9391345422fb335d4cca578820977bc8b SHA512 f0dc73769a74ca9098380640ae28508b204f4c198a97219bb2ac8445eff6120dbda64a9d2d80e5dcab48df34d7de844489702510b5a8d32677b5cb8e70c7b4d9 WHIRLPOOL e8bfaf0ca1a51991e3109a51068bea2619da7d3a93bba623d78f67f98681c43ad7dc3a1452fd13929081b3a118ae6a35ff07994251c857e3b6d35aabcd4b732e
 DIST blender-2.64a.tar.gz 31388178 SHA256 a5b1c3f1919b041a253d8d6d7c4f54e2b7f8a9531795675ab468ae742350cc7b SHA512 77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5 WHIRLPOOL 7f4878a606379dad9d121b0ad08f17e8691baf944147dc72dd33defd33a2303116a7090f7b8f8a186760fdd65ba9c0a0e523ed7d231fd23c070c31b52693178f
-EBUILD blender-2.49b-r2.ebuild 5256 SHA256 2b33b662c841ab4b465d794fcc1f657580a3db4a2e0239ee22f7605724c30d7f SHA512 59176e5ae83a86291dac87a942fd17c84e05c706409fa20d2655e1a68400d0726d18cf6892de404384b3f4ad67e21fafb33cc2a02dfec40bd79c3787fc99195d WHIRLPOOL d72f7c5287884e31f107b2de6ccb5db81bbda621d17ad8dd6d07d22b57e409f49a06a993dccf54c5f30a5dbef95aa18ff5a8528edef1f03dbd05c8827cc9b5e2
+EBUILD blender-2.49b-r2.ebuild 5294 SHA256 cb9fc26363b3ab6ca3b7a8a525d65a6b7a8b9f837af00c49893c174cd7d2714e SHA512 4c3358400f5c5121403e0a044ab85e1ce13beef9de364662c97f4229278cbdf83859c88d91b89c87e2a4f838d4f1a4e6e43ddf8e1acf1610c759f154ebb194e2 WHIRLPOOL 087ba7dc2858cd132174ed239745b1da68364c5169f50cd3ceea4bf949215352197cb98692acfb7247996e0d303700bfd70888b50732d635909c2c4715140b53
 EBUILD blender-2.64a.ebuild 7793 SHA256 c7d8f834d31e287958f44a6ae3ea94362b1f651f325df1256c4b1d97c2f48ed6 SHA512 ce6165280c3ac9b59e0e31c74791123fead93c9b91b169051328f4cdc9ad1e76ac6fea27ad8e8e3b7178639f3ef4cf8b8db79759e14afca302b39541ce18d472 WHIRLPOOL 55d443d2e0df5f7ec591cfae317d5b97f266b89a3146f67f4c73e8f7c9a1592908c833acaf9d285e6dacb59155a9637a7670c45b5167511d4c7530bae30ee010
-MISC ChangeLog 41186 SHA256 fccd2bb7ed0145fad753de9c40647fd5cc641b9332709e5409ce011ee0b37fd0 SHA512 4a65640a634fbe920d38cffd5b2b70a2e70e85311002a7fc91a2e739a9307cbe367b46caa2f2b4eb454278d81b9e19ff690422cadd9732be4b81938aeb95eacf WHIRLPOOL caa28544112663682ce36ab23e544406a6e524188488a331f9cf7adf6d9b5bc6c6c84265456539cb943c723da29d316b03ee9f650aee9e3fa9ff8e22ef71bf71
+MISC ChangeLog 41387 SHA256 d914e83d098b142726c301612d7f7dae629bec38f1560af5eac75836ebf7c2e3 SHA512 640c772e1e3ab074f4b71702e001601f42ee27a96869a09fffc760a8a2e7543d61332c5f5ddbea48d596528a9423a35db6905777089e2045e7803874eb7e89a1 WHIRLPOOL d494e23091ceabd8cf3438a8162047ec33949a063bc3c63f356a16164686619f3f4799ca0914eec4da820f6aad5e7e72ce6af500ea836370d44596479fbac623
 MISC metadata.xml 2158 SHA256 bff4c3ff97b8c96d1175eec436c9c2f583ec461f1546b1a0edee9767d89641ba SHA512 c0d0b4ff2b886a4a4ab2596e427113caa4379705113197021fab490953520368fa98bef40379dde6c508a3ec57df89a34121dfdef5ffdfbeca608cc3355c05c6 WHIRLPOOL 15ade3751c5017cc4c2f537b65f00d39bec68ccc15a1a0ac81ac8cb904f43bec10abf395d0834071873952391bb33bf2aee00d4c6007b7d8aeb52a599f15f287
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ4bc7AAoJEBzRPIrUMBNCiCsIAIfeAZjMvb8CAYke2Qz1s5Ob
-aSz7fdIZ9VbRVLGl+wrcRt6I6PDOllo3IALybZTnGfjvXDg8cdsqkFR0iJ/Fu18o
-FVbLAK15TBWvMuBgLfixBQc23Pfbtge3y1l7rYLiR0JexMEMvZL8kEFNWLRcwPLJ
-kkXlwzUEJPxvWtkO8mjds2HLfdXZ4cUfZAAdjv0nKiyyuYaOkWONuiyph53YfNH+
-QR0/vuGhyv+UcqE0pxtnhnkBlQagsTHZ3ge5nHfi8QiYqbnJA2I9BaSnCdtTaFHP
-V73mxfGaKizA9i0aJ1EPgPLFxb+o6h26eRhbv2zR/5rJDr9ghxQLdl4HLtiB/Ig=
-=O7dY
+iQEcBAEBCAAGBQJQ+Cv2AAoJEEdUh39IaPFNjVkIAI6R8fEJmGHf4fXrkOyNP1OI
+XhDZJDcM7c3a2HyLf8Qcbg2G0CQYVZwgB7JHrxWahh+lB4Zp0IEhdK5wSdV0dXxw
+1mVnCp4NnuabKTUWL/JabZGkGoDmsA5VYscw5GCiqlYocwZ+u34rss9sVCBZWZwd
+MhOikxWIFzEE8fv2NOvCS2ABR/iq6zs1KGHrNemkP9+0kViDfmrQCIfApxzGOU6l
+NVLpI8Ab6ElN7i2SDtjt8lScmwKwynVQR/muc0nTF+SO45ZLKlP7GsQQDMTiGK6/
+02CDZ/gCBS5eQ7M/mlsoITdYevzlOyEMlsXy2hVOEfySEovoDV+n/wBET6aGaqA=
+=1cVs
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/blender-2.49b-r2.ebuild b/media-gfx/blender/blender-2.49b-r2.ebuild
index 2a370d391a4b..df768b360f19 100644
--- a/media-gfx/blender/blender-2.49b-r2.ebuild
+++ b/media-gfx/blender/blender-2.49b-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.18 2012/12/11 09:59:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.49b-r2.ebuild,v 1.19 2013/01/17 16:52:21 ssuominen Exp $
 
 EAPI=2
 
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.49b-linux-3.patch  # Bug #381099
 	epatch "${FILESDIR}"/${PN}-2.49b-subversion-1.7.patch
 	epatch "${FILESDIR}"/${P}-libav-0.7.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 	rm -f "${S}/release/scripts/bpymodules/"*.pyc
 
 	# Fix building with >=media-libs/openjpeg-1.5.0 (bug #409283)
diff --git a/media-gfx/blender/files/blender-2.49b-gcc46.patch b/media-gfx/blender/files/blender-2.49b-gcc46.patch
new file mode 100644
index 000000000000..195ca0c24b99
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.49b-gcc46.patch
@@ -0,0 +1,32 @@
+http://bugs.gentoo.org/452694
+
+--- extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
++++ extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
+@@ -18,6 +18,7 @@
+ #define _BT_SOFT_BODY_INTERNALS_H

+ 

+ #include "btSoftBody.h"

++#include <string.h>

+ 

+ #include "LinearMath/btQuickprof.h"

+ #include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"

+@@ -171,8 +172,7 @@
+ template <typename T>

+ static inline void			ZeroInitialize(T& value)

+ {

+-	static const T	zerodummy;

+-	value=zerodummy;

++	memset(&value,0,sizeof(T));

+ }

+ //

+ template <typename T>

+--- intern/memutil/MEM_Allocator.h
++++ intern/memutil/MEM_Allocator.h
+@@ -24,6 +24,7 @@
+ #ifndef __MEM_Allocator_h_included__
+ #define __MEM_Allocator_h_included__ 1
+ 
++#include <cstddef>
+ #include "guardedalloc/MEM_guardedalloc.h"
+ #include "guardedalloc/BLO_sys_types.h"
+