diff options
author | Tiziano Müller <dev-zero@gentoo.org> | 2008-04-12 10:22:14 +0000 |
---|---|---|
committer | Tiziano Müller <dev-zero@gentoo.org> | 2008-04-12 10:22:14 +0000 |
commit | a97395e2165fcd718cae96ec600e6d202e30ea1f (patch) | |
tree | e3bbcb39bf0a270cf9a6e6c374a20ca0749a3213 /media-gfx/blender | |
parent | version bump (diff) | |
download | gentoo-2-a97395e2165fcd718cae96ec600e6d202e30ea1f.tar.gz gentoo-2-a97395e2165fcd718cae96ec600e6d202e30ea1f.tar.bz2 gentoo-2-a97395e2165fcd718cae96ec600e6d202e30ea1f.zip |
Added patch to make blender compile with gcc-4.3 (adds missing #includes)
(Portage version: 2.1.5_rc2, RepoMan options: --force)
Diffstat (limited to 'media-gfx/blender')
-rw-r--r-- | media-gfx/blender/ChangeLog | 7 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.45-r1.ebuild | 3 | ||||
-rw-r--r-- | media-gfx/blender/blender-2.45.ebuild | 3 | ||||
-rw-r--r-- | media-gfx/blender/files/blender-2.45-missing_includes.patch | 62 |
4 files changed, 72 insertions, 3 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index dadaeb9f1efc..aead6fd7b716 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/blender # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.131 2008/04/07 21:58:02 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.132 2008/04/12 10:22:13 dev-zero Exp $ + + 12 Apr 2008; Tiziano Müller <dev-zero@gentoo.org> + +files/blender-2.45-missing_includes.patch, blender-2.45.ebuild, + blender-2.45-r1.ebuild: + Added patch to make blender compile with gcc-4.3 (adds missing #includes) 07 Apr 2008; Ben de Groot <yngwin@gentoo.org> blender-2.43.ebuild, blender-2.45.ebuild: diff --git a/media-gfx/blender/blender-2.45-r1.ebuild b/media-gfx/blender/blender-2.45-r1.ebuild index 01acf6c44e3d..03ef8306e016 100644 --- a/media-gfx/blender/blender-2.45-r1.ebuild +++ b/media-gfx/blender/blender-2.45-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r1.ebuild,v 1.1 2008/03/26 08:56:08 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45-r1.ebuild,v 1.2 2008/04/12 10:22:13 dev-zero Exp $ inherit multilib flag-o-matic eutils python @@ -58,6 +58,7 @@ src_unpack() { epatch "${FILESDIR}"/blender-2.37-dirs.patch epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch epatch "${FILESDIR}"/blender-2.44-swscale.patch + epatch "${FILESDIR}"/${P}-missing_includes.patch if use ffmpeg ; then cd "${S}"/extern diff --git a/media-gfx/blender/blender-2.45.ebuild b/media-gfx/blender/blender-2.45.ebuild index b558d65a7a8e..e16addb25e19 100644 --- a/media-gfx/blender/blender-2.45.ebuild +++ b/media-gfx/blender/blender-2.45.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45.ebuild,v 1.5 2008/04/07 21:58:02 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.45.ebuild,v 1.6 2008/04/12 10:22:13 dev-zero Exp $ inherit multilib flag-o-matic eutils python @@ -59,6 +59,7 @@ src_unpack() { epatch "${FILESDIR}"/blender-2.37-dirs.patch epatch "${FILESDIR}"/blender-2.44-scriptsdir.patch epatch "${FILESDIR}"/blender-2.44-swscale.patch + epatch "${FILESDIR}"/${P}-missing_includes.patch if use ffmpeg ; then cd "${S}"/extern diff --git a/media-gfx/blender/files/blender-2.45-missing_includes.patch b/media-gfx/blender/files/blender-2.45-missing_includes.patch new file mode 100644 index 000000000000..53cf78fedf7c --- /dev/null +++ b/media-gfx/blender/files/blender-2.45-missing_includes.patch @@ -0,0 +1,62 @@ +diff -Naur blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp +--- blender-2.45.orig/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-12 11:52:10.000000000 +0200 ++++ blender-2.45/intern/ghost/intern/GHOST_WindowX11.cpp 2008-04-12 11:54:46.000000000 +0200 +@@ -38,6 +38,8 @@ + #include <X11/cursorfont.h> + #include <X11/Xatom.h> + ++#include <cstdio> ++ + #if defined(__sun__) || defined( __sun ) || defined (__sparc) || defined (__sparc__) + #include <strings.h> + #endif +diff -Naur blender-2.45.orig/intern/string/STR_String.h blender-2.45/intern/string/STR_String.h +--- blender-2.45.orig/intern/string/STR_String.h 2008-04-12 11:52:10.000000000 +0200 ++++ blender-2.45/intern/string/STR_String.h 2008-04-12 11:52:50.000000000 +0200 +@@ -47,6 +47,9 @@ + + #include <vector> + #include <limits.h> ++#include <cstring> ++#include <cstdlib> ++ + using namespace std; + + +diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_File.cpp blender-2.45/source/blender/yafray/intern/export_File.cpp +--- blender-2.45.orig/source/blender/yafray/intern/export_File.cpp 2008-04-12 11:52:12.000000000 +0200 ++++ blender-2.45/source/blender/yafray/intern/export_File.cpp 2008-04-12 12:06:53.000000000 +0200 +@@ -1,6 +1,7 @@ + #include "export_File.h" + +-#include <math.h> ++#include <cmath> ++#include <cstring> + + using namespace std; + +diff -Naur blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp blender-2.45/source/blender/yafray/intern/export_Plugin.cpp +--- blender-2.45.orig/source/blender/yafray/intern/export_Plugin.cpp 2008-04-12 11:52:12.000000000 +0200 ++++ blender-2.45/source/blender/yafray/intern/export_Plugin.cpp 2008-04-12 12:02:12.000000000 +0200 +@@ -1,6 +1,7 @@ + #include "export_Plugin.h" + +-#include <math.h> ++#include <cmath> ++#include <cstring> + using namespace std; + + +diff -Naur blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp blender-2.45/source/blender/yafray/intern/yafray_Render.cpp +--- blender-2.45.orig/source/blender/yafray/intern/yafray_Render.cpp 2008-04-12 11:52:12.000000000 +0200 ++++ blender-2.45/source/blender/yafray/intern/yafray_Render.cpp 2008-04-12 12:04:47.000000000 +0200 +@@ -6,7 +6,8 @@ + + #include "yafray_Render.h" + +-#include <math.h> ++#include <cmath> ++#include <cstring> + + using namespace std; + |