diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-01-17 16:52:21 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-01-17 16:52:21 +0000 |
| commit | 671a37eab6d2c3ec9dc2eedad41a3f796ce31fc4 (patch) | |
| tree | d9e74ac5197bccbd9eec3edfc1ee50e573dce206 /media-gfx/blender | |
| parent | we need ffmpeg-1.1 for the libav-9 patch (diff) | |
| download | gentoo-2-671a37eab6d2c3ec9dc2eedad41a3f796ce31fc4.tar.gz gentoo-2-671a37eab6d2c3ec9dc2eedad41a3f796ce31fc4.tar.bz2 gentoo-2-671a37eab6d2c3ec9dc2eedad41a3f796ce31fc4.zip | |
Fix building with sys-devel/gcc >= 4.6.0 wrt #452694 by Alexandre Borges Marcelo
(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.49b-r2.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.49b-gcc46.patch | 32 |
3 files changed, 42 insertions, 4 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/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" + |