diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2011-10-29 03:36:58 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2011-10-29 03:36:58 +0000 |
| commit | 77900a300ea19425b7d3937956f7bf235b143628 (patch) | |
| tree | 584bcb82f6625f43abc065e3e841df47ef5f1807 /media-gfx | |
| parent | Bump to 3.2.1 from the gnome overlay. Numerous changes and improvements. (diff) | |
| download | gentoo-2-77900a300ea19425b7d3937956f7bf235b143628.tar.gz gentoo-2-77900a300ea19425b7d3937956f7bf235b143628.tar.bz2 gentoo-2-77900a300ea19425b7d3937956f7bf235b143628.zip | |
media-gfx/blender: Fix 2.57-r1 for Linux 3.x (bug #381099)
(Portage version: 2.1.10.31/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.57-r1.ebuild | 5 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.57-linux-3.patch | 12 |
3 files changed, 21 insertions, 2 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 078d82c78779..528db4ad1be0 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/blender # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.201 2011/07/09 16:56:25 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.202 2011/10/29 03:36:58 sping Exp $ + + 29 Oct 2011; Sebastian Pipping <sping@gentoo.org> blender-2.57-r1.ebuild, + +files/blender-2.57-linux-3.patch: + Allow compilation of Blender 2.57-r1 against Linux 3.x (bug #381099) 09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> blender-2.49b-r2.ebuild: ppc64 stable wrt #349847 diff --git a/media-gfx/blender/blender-2.57-r1.ebuild b/media-gfx/blender/blender-2.57-r1.ebuild index 66fd0fb76d60..63a4fbba139a 100644 --- a/media-gfx/blender/blender-2.57-r1.ebuild +++ b/media-gfx/blender/blender-2.57-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.3 2011/07/08 10:22:39 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.57-r1.ebuild,v 1.4 2011/10/29 03:36:58 sping Exp $ PYTHON_DEPEND="3:3.2" @@ -152,6 +152,9 @@ src_prepare() { # einfo "Removing bundled Bullet2 ..." # rm -r extern/bullet2 # epatch "${FILESDIR}"/${PN}-${SLOT}-bullet.patch + + # Linux 3.x (bug #381099) + epatch "${FILESDIR}"/${P}-linux-3.patch } src_configure() { diff --git a/media-gfx/blender/files/blender-2.57-linux-3.patch b/media-gfx/blender/files/blender-2.57-linux-3.patch new file mode 100644 index 000000000000..6a96b49d12ca --- /dev/null +++ b/media-gfx/blender/files/blender-2.57-linux-3.patch @@ -0,0 +1,12 @@ +--- SConstruct 2011-10-29 05:18:43.149564401 +0200 ++++ SConstruct 2011-10-29 05:19:37.332887017 +0200 +@@ -165,6 +165,9 @@ + if crossbuild and platform not in ('win32-vc', 'win64-vc'): + platform = 'linuxcross' + ++if platform == 'linux3': ++ platform = 'linux2' # Workaround for Linux 3.x ++ + env['OURPLATFORM'] = platform + + configfile = os.path.join("build_files", "scons", "config", platform + "-config.py") |