diff options
| author |   Sebastian Pipping <sping@gentoo.org> | 2012-02-11 23:10:36 +0000 |
|---|---|---|
| committer | Sebastian Pipping <sping@gentoo.org> | 2012-02-11 23:10:36 +0000 |
| commit | 02e80ea6e927570761e77144f09d751833ba86d3 (patch) | |
| tree | 06f8ab24f520e6ec5fcfeed39ab6bd33765cecb6 /media-gfx/blender | |
| parent | media-libs/opencollada: Append LDPATH to env.d file (diff) | |
| download | gentoo-2-02e80ea6e927570761e77144f09d751833ba86d3.tar.gz gentoo-2-02e80ea6e927570761e77144f09d751833ba86d3.tar.bz2 gentoo-2-02e80ea6e927570761e77144f09d751833ba86d3.zip | |
media-gfx/blender: Fix compilation
(Portage version: 2.1.10.45/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/blender')
| -rw-r--r-- | media-gfx/blender/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/blender/blender-2.60a.ebuild | 3 | ||||
| -rw-r--r-- | media-gfx/blender/files/blender-2.61-opencollada-debug.patch | 15 |
3 files changed, 22 insertions, 2 deletions
diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog index 47c70061e2ce..923741bbebfd 100644 --- a/media-gfx/blender/ChangeLog +++ b/media-gfx/blender/ChangeLog @@ -1,6 +1,10 @@ # 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.219 2012/02/06 21:48:17 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.220 2012/02/11 23:10:36 sping Exp $ + + 11 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild, + +files/blender-2.61-opencollada-debug.patch: + Fix compilation for USE="debug collada", patch by Anthoine Bourgeois 06 Feb 2012; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild, metadata.xml: diff --git a/media-gfx/blender/blender-2.60a.ebuild b/media-gfx/blender/blender-2.60a.ebuild index b81910d96d8f..87701df3d5f6 100644 --- a/media-gfx/blender/blender-2.60a.ebuild +++ b/media-gfx/blender/blender-2.60a.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.7 2012/02/06 21:48:17 sping Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.60a.ebuild,v 1.8 2012/02/11 23:10:36 sping Exp $ PYTHON_DEPEND="3:3.2" EAPI=4 @@ -120,6 +120,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-desktop.patch epatch "${FILESDIR}"/${P}-collada.patch + epatch "${FILESDIR}"/${PN}-2.61-opencollada-debug.patch epatch "${FILESDIR}"/${PN}-${SLOT}-doxyfile.patch # TODO: write a proper Makefile to replace the borked bmake script diff --git a/media-gfx/blender/files/blender-2.61-opencollada-debug.patch b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch new file mode 100644 index 000000000000..0310c478736d --- /dev/null +++ b/media-gfx/blender/files/blender-2.61-opencollada-debug.patch @@ -0,0 +1,15 @@ +diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py +--- blender-2.61.orig/build_files/scons/tools/Blender.py 2012-02-08 22:33:29.133700566 +0100 ++++ blender-2.61/build_files/scons/tools/Blender.py 2012-02-08 22:35:13.459698722 +0100 +@@ -276,10 +276,7 @@ def setup_syslibs(lenv): + syslibs += Split(lenv['BF_PTHREADS_LIB']) + if lenv['WITH_BF_COLLADA']: + syslibs.append(lenv['BF_PCRE_LIB']) +- if lenv['BF_DEBUG']: +- syslibs += [colladalib+'_d' for colladalib in Split(lenv['BF_OPENCOLLADA_LIB'])] +- else: +- syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) ++ syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) + syslibs.append(lenv['BF_EXPAT_LIB']) + if lenv['WITH_BF_COLAMD']: + syslibs += Split(lenv['BF_COLAMD_LIB']) |