From 33fb98c0f1d4d74c2d6c80b8e5557d2afc25e70b Mon Sep 17 00:00:00 2001 From: Anthoine Bourgeois Date: Tue, 8 May 2012 13:28:56 +0200 Subject: +blender-2.63.ebuild --- media-gfx/blender/Manifest | 13 + media-gfx/blender/blender-2.63.ebuild | 447 +++++++++++++++++ .../files/blender-2.63-CVE-2009-3850-v5.patch | 164 ++++++ media-gfx/blender/files/blender-2.63-bullet.patch | 193 +++++++ media-gfx/blender/files/blender-2.63-colamd.patch | 199 ++++++++ media-gfx/blender/files/blender-2.63-collada.patch | 11 + media-gfx/blender/files/blender-2.63-desktop.patch | 22 + .../blender/files/blender-2.63-doxyfile.patch | 13 + media-gfx/blender/files/blender-2.63-eigen.patch | 556 +++++++++++++++++++++ .../files/blender-2.63-enable_site_module.patch | 34 ++ media-gfx/blender/files/blender-2.63-glew.patch | 49 ++ .../blender/files/blender-2.63-insecure.desktop | 17 + .../files/blender-2.63-opencollada-debug.patch | 15 + 13 files changed, 1733 insertions(+) create mode 100644 media-gfx/blender/blender-2.63.ebuild create mode 100644 media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch create mode 100644 media-gfx/blender/files/blender-2.63-bullet.patch create mode 100644 media-gfx/blender/files/blender-2.63-colamd.patch create mode 100644 media-gfx/blender/files/blender-2.63-collada.patch create mode 100644 media-gfx/blender/files/blender-2.63-desktop.patch create mode 100644 media-gfx/blender/files/blender-2.63-doxyfile.patch create mode 100644 media-gfx/blender/files/blender-2.63-eigen.patch create mode 100644 media-gfx/blender/files/blender-2.63-enable_site_module.patch create mode 100644 media-gfx/blender/files/blender-2.63-glew.patch create mode 100644 media-gfx/blender/files/blender-2.63-insecure.desktop create mode 100644 media-gfx/blender/files/blender-2.63-opencollada-debug.patch diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index f5351c9..af92293 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -34,10 +34,22 @@ AUX blender-2.62-glew.patch 2039 RMD160 29a967d1cb167b26076e1e73fa7220d7d21364d3 AUX blender-2.62-insecure.desktop 596 RMD160 a986b8c2f3ab5fea15c3201c5733f848bc1b299c SHA1 d0a52d00c8912c253e5a066f397321e9f178be71 SHA256 b1dfac484638b86f1256eb7b04270ad6433c3a2bc7c20bf5bdd1a8ebed31aea2 AUX blender-2.62-jp2.patch 393 RMD160 ebd2e45c8643628d7f50b20b195ca699da3f2bdb SHA1 e11148ba1da9814a3820a1507b5f871eea485bc0 SHA256 cd4c0d77577fdd47d14262fd0e46d47fa41f597c736df41f1738942b8a97c7a7 AUX blender-2.62-opencollada-debug.patch 876 RMD160 38b989f11e7880a27c3eac3bf0d3eb5146dfa3e0 SHA1 836ddc2562b9eb4a0f48d467c4e0c008d120e0b3 SHA256 c781a1fc7f808c25fd0bc57524bc07ce36133dbfb2e2bdc27fa19b215597d905 +AUX blender-2.63-CVE-2009-3850-v5.patch 9062 RMD160 ca4aec257bae31766304673d6ebf81fddabcbf7a SHA1 e2b9c283100fd0117879a3b764a17a2c3e8d28a5 SHA256 8ce1e9d5b836df94bd7d4203db53434e33ac174533b6a7a06a2bc40ba75da633 +AUX blender-2.63-bullet.patch 8127 RMD160 4dfa3a786c56b39416b81b4272bab3bc3a76a945 SHA1 d1f0d789b79d0cd45501e23dbfcd986ed3a89ba3 SHA256 b5261abe7d217c0613454a381b5f8f7b18deb5143600ac5b88352b920cc6d4f0 +AUX blender-2.63-colamd.patch 8898 RMD160 36e6e4fdba0ab3b60d3ce39273056a369e328ba3 SHA1 f073734219ecc02f7820c8ccc42d2220e4cb3bec SHA256 b7e1ce3132cf00216e7063665d3140398d1b54451a2759e600cf9525202fe40f +AUX blender-2.63-collada.patch 1402 RMD160 dc284668aa16ef45fa16444e76607cdd6f28972e SHA1 b9aced38ac79c5d05b4e8890dd7fd1d90a1c8c53 SHA256 0f8f6cea54e060cc0cff23a62394f6ef2a4fc84f6baa41b49e667176019f81dd +AUX blender-2.63-desktop.patch 908 RMD160 7a4a4c2b80c4d0bb0466343fe3e1fb2f40c43af2 SHA1 0fd5625df48a464a709a2a801355a299f58e823a SHA256 0e2b1b97fadc4ec0aa110963af1efe9ec98148bbb295c14852d3aeafa582860e +AUX blender-2.63-doxyfile.patch 797 RMD160 01e84c17d372a525cb5ac58bd27b0393267b64f3 SHA1 8d704d96f613d4ea97b37d5df0b05eb91b7f6e13 SHA256 9642445ac1531951a81f0314fa867597fc9dda82a20f638f3f07f8bc248daf23 +AUX blender-2.63-eigen.patch 27754 RMD160 51f1100deaf7f5ba3302ae0f53a700790c541bbb SHA1 8596e518d9e9ed1ac623583e35b8b35a265d9df0 SHA256 cbb4ff5ea30294238b2f0acd29c533998c736dab673405b17af16896e04b3b91 +AUX blender-2.63-enable_site_module.patch 1560 RMD160 493a3ed0e7cb7ae2ab4eaf2c51e066c20c743e37 SHA1 b82125e3348a530c2818b410b426424d9aa70e63 SHA256 805e3994a0ed3a96232e4d61beaf20bba9d2b2814f7f600a346f20e7f62c568a +AUX blender-2.63-glew.patch 2057 RMD160 538630b168ad1a495886c18a44c5acc41961ff36 SHA1 45095fdf424c07924267b2571c296d016acc3111 SHA256 3265078bf60e417f0ef342f23415f56c106d75191660bd2a614e88856b8ee1b0 +AUX blender-2.63-insecure.desktop 727 RMD160 823c81c9771112f53212df7b9457d115931bddfc SHA1 72a0164f5f45836a232de6405b5278d91fb98150 SHA256 630e3cff84bedbe428bfd60b2890b0eabe1abf9eaa375d5dbd2701102412368a +AUX blender-2.63-opencollada-debug.patch 876 RMD160 5c62aac0b551e60711f750eda409caa890974927 SHA1 4667676e1952fdf864cd18826c5fbd15522280fe SHA256 c91893010b20705718ee86592cc2bf798ea3b56e26852ccaca5ea97944539d68 AUX blender-desktop.patch 641 RMD160 5be612d2836005e51e1bcfed10959e75315f201f SHA1 b0f99cdefc6c1a21b32ea97a237e214b22e5f9e6 SHA256 f52bc6f42eb07e693bfbe578747cf126b242b04273cbcd78a8ee4879eae8b514 DIST blender-2.60a.tar.gz 25679123 RMD160 74434c4e748872322386971cf6021255b0bfa1c8 SHA1 f23551e6ed661626c61de4a758d9ff67e0f27529 SHA256 7d788599ab46dac37f630dec026d06f7e3d73508f243eeb4ade8bcdcb661f124 DIST blender-2.61.tar.gz 25087312 RMD160 fb3b368144d31cd850a0602b7b5e746fca17d7fc SHA1 1b0d008e8022cb29efc9b4a337379eeb93bdcbb7 SHA256 58563583c8775fa0f746a7f4899b1619fec3df69accfa536544fdcbf372685f1 DIST blender-2.62.tar.gz 26309220 RMD160 2a0067ac77659f507b141a0a25221d7410df9df7 SHA1 59d538d175695014fc0f8b6165127d5190378415 SHA256 7894db0072499af70f7cad1244bc1a701167fcbcf45d6ce1b8e41ad377c9aea7 +DIST blender-2.63.tar.gz 27361289 RMD160 25c4453ec966792c54e4cae43a86f521f0bc4658 SHA1 8d7359a86d716cc2198f776f28bac6625a45d6ad SHA256 ec70cc3fd5337012153fe07dbb415728cc5a48eba93c9888c660d0fbdc2294fc EBUILD blender-2.60a.ebuild 13758 RMD160 1d9cb5abdcc1759472279364dcc013d496cad75f SHA1 3c1103e7212dc61169411a46f5b74377b744f352 SHA256 8046fa06274b9299711717cc936ede7bf9209e532cad1a969a89888a1a9c85d5 EBUILD blender-2.61-r1.ebuild 12980 RMD160 7091e4afa22d95a9b987d4bc71553a1476727117 SHA1 d6bc4a0f3621dd23a490df389ce97652cc5719e2 SHA256 f5f53b533913fa391b393d51b2b27d073c51abf8ef7c5e700a9a4a7fe50a07be EBUILD blender-2.61-r2.ebuild 12241 RMD160 2a144de5c5f8d8d932ad557e60011779124e9d8c SHA1 bbc7e9a3ae37c3f433ae036806469a95b47154cc SHA256 09c29d5f6058b98735068c00e9e9f1d8285b7f4d40cddcbae1cf67e1fdf8311c @@ -48,4 +60,5 @@ EBUILD blender-2.61.ebuild 13765 RMD160 da7073339b97bcea808cd152e0a871f9c2bc0b4e EBUILD blender-2.62-r1.ebuild 13511 RMD160 90d14e7bf5988130a581e06a6ec2e473cd65d85e SHA1 44358eac15cbde82854e94ec4a234a0b13c05af6 SHA256 6e4b0741e9f913fed6568b5d561d9f90d37f4e17543f30dd3026341b925b0bc6 EBUILD blender-2.62-r2.ebuild 13563 RMD160 d46b643f992a4dfe78cb4f65980227178d3731ee SHA1 484b54d61e9113544a1da9ceb55c0cf4e5662143 SHA256 111c44b64dafa130188d8c0745d0926cff9a4d4b7c49d359920c2ddb1e41c3b1 EBUILD blender-2.62.ebuild 13440 RMD160 a8980096fe813c142bca591cf79c79355ec5fdbb SHA1 673dd6d374a811c9d74d8e117fa19805687f90fc SHA256 00d8aedfd1e856059419e32b4bbedcb87cc58112ba9670db61a274b2be64a63e +EBUILD blender-2.63.ebuild 13495 RMD160 c8c53fe70dcf591879566f7bfda29e8ddff29ec9 SHA1 fa130b2f81d5796ba0ad724f66168f161089746f SHA256 44b599d092784e1951b300701287571b5b8dcef624654fd46d3919aba5eff91c MISC metadata.xml 2031 RMD160 7cef28cc97256936c8420d9399c5469dc917f7d1 SHA1 734027d18091dc859e24ec436f7ac992521223d7 SHA256 2aec9b99fcd11925094c06634d41af4cd3681cb81b404cc170b230dd4e337d13 diff --git a/media-gfx/blender/blender-2.63.ebuild b/media-gfx/blender/blender-2.63.ebuild new file mode 100644 index 0000000..3aa52ba --- /dev/null +++ b/media-gfx/blender/blender-2.63.ebuild @@ -0,0 +1,447 @@ +# 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.60a.ebuild,v 1.4 2011/11/13 22:43:48 sping Exp $ + +PYTHON_DEPEND="3:3.2" +EAPI=4 + +if [[ ${PV} == *9999 ]] ; then +SCM="subversion" +ESVN_REPO_URI="https://svn.blender.org/svnroot/bf-blender/trunk/blender" +fi + +inherit multilib scons-utils eutils python versionator flag-o-matic toolchain-funcs pax-utils ${SCM} + +IUSE="cycles +game-engine player +elbeem +openexr ffmpeg jpeg2k openal openmp \ + +dds doc fftw jack apidoc sndfile tweak-mode sdl sse \ + redcode iconv contrib collada 3dmouse" + +LANGS="en ar bg ca cs de el es es_ES fa fi fr hr id it ja ky ne pl pt ru ir sr sr@latin sv tr uk zh_CN zh_TW" +for X in ${LANGS} ; do + IUSE="${IUSE} linguas_${X}" +done + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org" +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" +elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot + SRC_URI="mirror://gentoo/${P}.tar.xz" +else # Official release + SRC_URI="http://download.blender.org/source/${P}.tar.gz" +fi + +#SLOT="$(get_version_component_range 1-2)" +SLOT="2.60" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~x86" + +RDEPEND="virtual/jpeg + media-libs/libpng:0 + x11-libs/libXi + x11-libs/libX11 + media-libs/tiff:0 + media-libs/libsamplerate + virtual/opengl + >=media-libs/freetype-2.0 + virtual/libintl + media-libs/glew + >=sci-physics/bullet-2.78[-double-precision] + dev-cpp/eigen:3 + sci-libs/colamd + sys-libs/zlib + cycles? ( + media-libs/openimageio + dev-libs/boost + ) + iconv? ( virtual/libiconv ) + sdl? ( media-libs/libsdl[audio,joystick] ) + openexr? ( media-libs/openexr ) + ffmpeg? ( + >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora] + jpeg2k? ( >=virtual/ffmpeg-0.6.90[x264,mp3,encode,theora,jpeg2k] ) + ) + openal? ( >=media-libs/openal-1.6.372 ) + fftw? ( sci-libs/fftw:3.0 ) + jack? ( media-sound/jack-audio-connection-kit ) + sndfile? ( media-libs/libsndfile ) + collada? ( media-libs/opencollada ) + 3dmouse? ( dev-libs/libspnav )" + +DEPEND="dev-util/scons + apidoc? ( + dev-python/sphinx + app-doc/doxygen[-nodot] + game-engine? ( dev-python/epydoc ) + ) + ${RDEPEND}" + +# configure internationalization only if LINGUAS have more +# languages than 'en', otherwise must be disabled +if [[ ${LINGUAS} != "en" && -n ${LINGUAS} ]]; then + DEPEND="${DEPEND} + sys-devel/gettext" +fi + +blend_with() { + local UWORD="$2" + [ -z "${UWORD}" ] && UWORD="$1" + if use $1; then + echo "WITH_BF_${UWORD}=1" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + else + echo "WITH_BF_${UWORD}=0" | tr '[:lower:]' '[:upper:]' \ + >> "${S}"/user-config.py + fi +} + +src_unpack() { +if [[ ${PV} == *9999 ]] ; then + subversion_fetch + if use contrib; then + S="${S}"/release/scripts/addons_contrib subversion_fetch \ + "https://svn.blender.org/svnroot/bf-extensions/contrib/py/scripts/addons/" + fi +else + unpack ${A} +fi +} + +pkg_setup() { + enable_openmp=0 + if use openmp; then + if tc-has-openmp; then + enable_openmp=1 + else + ewarn "You are using gcc built without 'openmp' USE." + ewarn "Switch CXX to an OpenMP capable compiler." + die "Need openmp" + fi + fi + python_set_active_version 3 +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-desktop.patch + epatch "${FILESDIR}"/${P}-collada.patch + epatch "${FILESDIR}"/${P}-doxyfile.patch + + # OpenJPEG + einfo "Removing bundled OpenJPEG ..." + rm -r extern/libopenjpeg + epatch "${FILESDIR}"/${PN}-${SLOT}-openjpeg.patch + + # Glew + einfo "Removing bundled Glew ..." + rm -r extern/glew + epatch "${FILESDIR}"/${P}-glew.patch + + # Eigen3 + einfo "Removing bundled Eigen3 ..." + rm -r extern/Eigen3 + epatch "${FILESDIR}"/${P}-eigen.patch + + # Bullet2 + einfo "Removing bundled Bullet2 ..." + rm -r extern/bullet2 + epatch "${FILESDIR}"/${P}-bullet.patch + + # Colamd + einfo "Removing bundled Colamd ..." + rm -r extern/colamd + epatch "${FILESDIR}"/${P}-colamd.patch + + ewarn "$(echo "Remaining bundled dependencies:"; + find extern -mindepth 1 -maxdepth 1 -type d | sed 's|^|- |')" + + # Linux 3.x (bug #381099) + epatch "${FILESDIR}"/${PN}-${SLOT}-linux-3.patch + + epatch "${FILESDIR}"/${PN}-${SLOT}-libav-0.7.patch + epatch "${FILESDIR}"/${P}-CVE-2009-3850-v5.patch + epatch "${FILESDIR}"/${P}-enable_site_module.patch + epatch "${FILESDIR}"/${P}-opencollada-debug.patch +} + +src_configure() { + # add system openjpeg into Scons build options. + cat <<- EOF >> "${S}"/user-config.py + BF_OPENJPEG="/usr" + BF_OPENJPEG_INC="/usr/include" + BF_OPENJPEG_LIB="openjpeg" + EOF + + # add system sci-physic/bullet into Scons build options. + cat <<- EOF >> "${S}"/user-config.py + WITH_BF_BULLET=1 + BF_BULLET="/usr/include" + BF_BULLET_INC="/usr/include/bullet /usr/include/bullet/BulletCollision /usr/include/bullet/BulletDynamics /usr/include/bullet/LinearMath /usr/include/bullet/BulletSoftBody" + BF_BULLET_LIB="BulletSoftBody BulletDynamics BulletCollision LinearMath" + EOF + + # add system sci-libs/colamd into Scons build options. + cat <<- EOF >> "${S}"/user-config.py + WITH_BF_COLAMD=1 + BF_COLAMD="/usr" + BF_COLAMD_INC="/usr/include" + BF_COLAMD_LIB="colamd" + EOF + + #add iconv into Scons build options. + if use !elibc_glibc && use !elibc_uclibc && use iconv; then + cat <<- EOF >> "${S}"/user-config.py + WITH_BF_ICONV=1 + BF_ICONV="/usr" + EOF + fi + + # configure internationalization only if LINGUAS have more + # languages than 'en', otherwise must be disabled + [[ -z ${LINGUAS} ]] || [[ ${LINGUAS} == "en" ]] && echo "WITH_BF_INTERNATIONAL=0" >> "${S}"/user-config.py + + # Ocean sim system needs fftw + use fftw || echo "WITH_BF_OCEANSIM=0" >> "${S}"/user-config.py + + # configure Tweak Mode + use tweak-mode && echo "BF_TWEAK_MODE=1" >> "${S}"/user-config.py + + # FIX: Game Engine module needs to be active to build the Blender Player + if ! use game-engine && use player; then + elog "Forcing Game Engine [+game-engine] as required by Blender Player [+player]" + echo "WITH_BF_GAMEENGINE=1" >> "${S}"/user-config.py + else + blend_with game-engine gameengine + fi + + # set CFLAGS used in /etc/make.conf correctly + echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \ + | sed -e "s:,]: ]:" >> "${S}"/user-config.py + + # set CXXFLAGS used in /etc/make.conf correctly + local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',; done`" + echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py + echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py + + # reset general options passed to the C/C++ compilers (useless hardcoded flags) + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']" >> "${S}"/user-config.py + + # set LDFLAGS used in /etc/make.conf correctly + local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',; done`" + echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py + echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >> "${S}"/user-config.py + + # reset REL_* variables (useless hardcoded flags) + cat <<- EOF >> "${S}"/user-config.py + REL_CFLAGS=[] + REL_CXXFLAGS=[] + REL_CCFLAGS=[] + EOF + + # reset warning flags (useless for NON blender developers) + cat <<- EOF >> "${S}"/user-config.py + C_WARN =[ '-w', '-g0' ] + CC_WARN =[ '-w', '-g0' ] + CXX_WARN=[ '-w', '-g0' ] + EOF + + # detecting -j value from MAKEOPTS + local NUMJOBS="$( echo "${MAKEOPTS}" | sed -ne 's,.*-j\([[:digit:]]\+\).*,\1,p' )" + [[ -z "${NUMJOBS}" ]] && NUMJOBS=1 # resetting to -j1 for empty MAKEOPTS + + # generic settings which differ from the defaults from linux2-config.py + cat <<- EOF >> "${S}"/user-config.py + BF_OPENGL_LIB='GL GLU X11 Xi GLEW' + BF_INSTALLDIR="../install" + WITH_PYTHON_SECURITY=1 + WITHOUT_BF_PYTHON_INSTALL=1 + BF_PYTHON="/usr" + BF_PYTHON_VERSION="3.2" + BF_PYTHON_ABI_FLAGS="" + BF_BUILDINFO=0 + BF_QUIET=1 + BF_NUMJOBS=${NUMJOBS} + BF_LINE_OVERWRITE=0 + WITH_BF_FHS=1 + WITH_BF_BINRELOC=0 + WITH_BF_STATICOPENGL=0 + WITH_BF_OPENMP=${enable_openmp} + EOF + + # configure WITH_BF* Scons build options + for arg in \ + 'elbeem fluid' \ + 'sdl' \ + 'apidoc docs' \ + 'jack' \ + 'sndfile' \ + 'openexr' \ + 'dds' \ + 'fftw fftw3' \ + 'jpeg2k openjpeg' \ + 'openal'\ + 'ffmpeg' \ + 'ffmpeg ogg' \ + 'player' \ + 'sse rayoptimization' \ + 'redcode' \ + 'collada' \ + '3dmouse' ; do + blend_with ${arg} + done + + # add system media-libs/opencollada into Scons build options. + echo 'BF_OPENCOLLADA_INC="/usr/include/opencollada/"' >> "${S}"/user-config.py + echo 'BF_OPENCOLLADA_LIBPATH="/usr/'$(get_libdir)'/opencollada/"' >> "${S}"/user-config.py + + # enable debugging/testing support + is-flag "-g*" && echo "BF_DEBUG=1" >> "${S}"/user-config.py + #use test && echo "BF_UNIT_TEST=1" >> "${S}"/user-config.py + + # enables Cycles render engine + if use cycles; then + cat <<- EOF >> "${S}"/user-config.py + WITH_BF_CYCLES=1 + WITH_BF_OIIO=1 + BF_OIIO="/usr" + BF_OIIO_INC="/usr/include" + BF_OIIO_LIB="OpenImageIO" + WITH_BF_BOOST=1 + BF_BOOST="/usr" + BF_BOOST_INC="/usr/include/boost" + EOF + fi + +} + +src_compile() { + escons || die \ + '!!! Please add "${S}/scons.config" when filing bugs reports \ + to bugs.gentoo.org' +} + +src_install() { + # creating binary wrapper + cat <<- EOF >> "${WORKDIR}/install/blender-${PV}" + #!/bin/sh + + # stop this script if the local blender path is a symlink + if [ -L \${HOME}/.blender ]; then + echo "Detected a symbolic link for \${HOME}/.blender" + echo "Sorry, to avoid dangerous situations, the Blender binary can" + echo "not be started until you have removed the symbolic link:" + echo " # rm -i \${HOME}/.blender" + exit 1 + fi + + export BLENDER_SYSTEM_SCRIPTS="/usr/share/blender/${PV}/scripts" + export BLENDER_SYSTEM_DATAFILES="/usr/share/blender/${PV}/datafiles" + export BLENDER_SYSTEM_PLUGINS="/usr/lib/blender/${PV}/plugins" + exec /usr/bin/blender-bin-${PV} \$* + EOF + + # Pax mark blender for hardened support. + pax-mark m "${WORKDIR}/install/blender" + + # install binaries + exeinto /usr/bin/ + cp "${WORKDIR}/install/blender" "${WORKDIR}/install/blender-bin-${PV}" + doexe "${WORKDIR}/install/blender-bin-${PV}" + doexe "${WORKDIR}/install/blender-${PV}" + if use player; then + cp "${WORKDIR}/install/blenderplayer" \ + "${WORKDIR}/install/blenderplayer-${PV}" + doexe "${WORKDIR}/install/blenderplayer-${PV}" + fi + + # install plugin headers + insinto /usr/include/${PN}/${PV} + doins "${WORKDIR}"/${P}/source/blender/blenpluginapi/*.h + + # install contrib scripts addons + insinto /usr/share/${PN}/${PV}/scripts + use contrib && doins -r "${WORKDIR}"/${P}/release/scripts/addons_contrib + + # install desktop file + insinto /usr/share/pixmaps + cp release/freedesktop/icons/scalable/apps/blender.svg \ + release/freedesktop/icons/scalable/apps/blender-${PV}.svg + doins release/freedesktop/icons/scalable/apps/blender-${PV}.svg + insinto /usr/share/applications + cp release/freedesktop/blender.desktop \ + release/freedesktop/blender-${PV}.desktop + doins release/freedesktop/blender-${PV}.desktop + newins "${FILESDIR}"/${P}-insecure.desktop ${P}-insecure.desktop + + # install docs + doman "${WORKDIR}"/${P}/doc/manpage/blender.1 + use doc && dodoc -r "${WORKDIR}"/${P}/doc/guides/* + if use apidoc; then + + einfo "Generating (BGE) Blender Game Engine API docs ..." + epydoc source/gameengine/PyDoc/*.py -v \ + -o doc/BGE_API \ + --quiet --quiet --quiet \ + --simple-term \ + --url "http://www.blender.org" \ + --top API_intro \ + --name "Blender GameEngine" \ + --no-private --no-sourcecode \ + --inheritance=included \ + --graph=all \ + --dotpath /usr/bin/dot \ + || die "epydoc failed." + docinto "API/gameengine" + dohtml -r "${WORKDIR}"/${P}/doc/BGE_API/* + + #einfo "Generating (BPY) Blender Python API docs ..." + "${D}"/usr/bin/blender-bin-${PV} --background --python doc/python_api/sphinx_doc_gen.py --noaudio || die "blender failed." + pushd doc/python_api > /dev/null + sphinx-build sphinx-in BPY_API || die "sphinx failed." + popd > /dev/null + docinto "API/python" + dohtml -r doc/python_api/BPY_API/* + + einfo "Generating Blender C/C++ API docs ..." + pushd "${WORKDIR}"/${P}/doc/doxygen > /dev/null + doxygen -u Doxyfile + doxygen || die "doxygen failed to build API docs." + docinto "API/blender" + dohtml -r html/* + popd > /dev/null + fi + + # final cleanup + rm -r "${WORKDIR}"/install/{Python-license.txt,icons,GPL-license.txt,copyright.txt} + if [[ -z ${LINGUAS} || ${LINGUAS} == "en" ]]; then + rm -r "${WORKDIR}/install/${PV}/datafiles/locale" + else + for x in "${WORKDIR}"/install/${PV}/datafiles/locale/* ; do + mylang=${x##*/} + has ${mylang} ${LINGUAS} || rm -r ${x} + done + fi + + # installing blender + insinto /usr/share/${PN}/${PV} + doins -r "${WORKDIR}"/install/${PV}/* + + # FIX: making all python scripts readable only by group 'users', + # so nobody can modify scripts apart root user, but python + # cache (*.pyc) can be written and shared across the users. +# chown root:users -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die +# chmod 755 -R "${D}/usr/share/${PN}/${SLOT}/scripts" || die +} + +pkg_postinst() { + echo + elog "Blender uses python integration. As such, may have some" + elog "inherit risks with running unknown python scripting." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog +} diff --git a/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch b/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch new file mode 100644 index 0000000..671e037 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-CVE-2009-3850-v5.patch @@ -0,0 +1,164 @@ +diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py +--- blender-2.63.orig/build_files/scons/tools/btools.py 2012-05-08 00:05:06.963498491 +0200 ++++ blender-2.63/build_files/scons/tools/btools.py 2012-05-08 00:06:42.238496807 +0200 +@@ -96,7 +96,7 @@ def print_arguments(args, bc): + + def validate_arguments(args, bc): + opts_list = [ +- 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', ++ 'WITH_BF_PYTHON', 'WITH_BF_PYTHON_SAFETY', 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'WITH_BF_STATICPYTHON', 'WITH_OSX_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', 'BF_PYTHON_DLL', 'BF_PYTHON_ABI_FLAGS', 'WITH_PYTHON_SECURITY', + 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', + 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', + 'WITH_BF_JACK', 'BF_JACK', 'BF_JACK_INC', 'BF_JACK_LIB', 'BF_JACK_LIBPATH', +@@ -261,6 +261,7 @@ def read_opts(env, cfg, args): + (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)), + (BoolVariable('WITH_OSX_STATICPYTHON', 'Staticly link to python', True)), + ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''), ++ (BoolVariable('WITH_PYTHON_SECURITY', 'Disables execution of scripts within blend files by default (recommend to leave off)', False)), + + (BoolVariable('WITH_BF_FLUID', 'Build with Fluid simulation (Elbeem)', True)), + (BoolVariable('WITH_BF_DECIMATE', 'Build with decimate modifier', True)), +diff -Npur blender-2.63.orig/SConstruct blender-2.63/SConstruct +--- blender-2.63.orig/SConstruct 2012-05-08 00:05:06.933498492 +0200 ++++ blender-2.63/SConstruct 2012-05-08 00:05:45.665497801 +0200 +@@ -349,6 +349,10 @@ if 'blenderplayer' in B.targets: + if 'blendernogame' in B.targets: + env['WITH_BF_GAMEENGINE'] = False + ++# build without python autoexec security? ++if env['WITH_PYTHON_SECURITY'] == True: ++ env.Append(CPPFLAGS=['-DWITH_PYTHON_SECURITY']) ++ + # build without elbeem (fluidsim)? + if env['WITH_BF_FLUID'] == 1: + env['CPPFLAGS'].append('-DWITH_MOD_FLUID') +diff -Npur blender-2.63.orig/source/blender/blenkernel/intern/blender.c blender-2.63/source/blender/blenkernel/intern/blender.c +--- blender-2.63.orig/source/blender/blenkernel/intern/blender.c 2012-05-08 00:05:06.994498491 +0200 ++++ blender-2.63/source/blender/blenkernel/intern/blender.c 2012-05-08 00:07:04.274496414 +0200 +@@ -145,6 +145,7 @@ void initglobals(void) + G.f |= G_SCRIPT_AUTOEXEC; + #else + G.f &= ~G_SCRIPT_AUTOEXEC; ++ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ + #endif + } + +diff -Npur blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.63/source/blender/makesrna/intern/rna_userdef.c +--- blender-2.63.orig/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:05:07.002498491 +0200 ++++ blender-2.63/source/blender/makesrna/intern/rna_userdef.c 2012-05-08 00:08:04.547495355 +0200 +@@ -126,9 +126,17 @@ static void rna_userdef_show_manipulator + + static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) + { +- UserDef *userdef = (UserDef*)ptr->data; +- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; +- else G.f |= G_SCRIPT_AUTOEXEC; ++ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { ++ /* Blender run with --enable-autoexec */ ++ UserDef *userdef = (UserDef*)ptr->data; ++ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; ++ else G.f |= G_SCRIPT_AUTOEXEC; ++ } ++} ++ ++static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) { ++ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ ++ return !(G.f & G_SCRIPT_OVERRIDE_PREF); + } + + static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) +@@ -2994,6 +3002,8 @@ static void rna_def_userdef_system(Blend + "Allow any .blend file to run scripts automatically " + "(unsafe with blend files from an untrusted source)"); + RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); ++ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ ++ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable"); + + prop = RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); +diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c blender-2.63/source/blender/windowmanager/intern/wm_files.c +--- blender-2.63.orig/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:05:07.094498489 +0200 ++++ blender-2.63/source/blender/windowmanager/intern/wm_files.c 2012-05-08 00:09:20.964493999 +0200 +@@ -288,13 +288,18 @@ static void wm_init_userdef(bContext *C) + + /* set the python auto-execute setting from user prefs */ + /* enabled by default, unless explicitly enabled in the command line which overrides */ +- if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { ++ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { ++ /* Blender run with --enable-autoexec */ + if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; + else G.f &= ~G_SCRIPT_AUTOEXEC; + } + + /* update tempdir from user preferences */ + BLI_init_temporary_dir(U.tempdir); ++ ++ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */ ++ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC)) ++ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE; + } + + +diff -Npur blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.63/source/blender/windowmanager/intern/wm_operators.c +--- blender-2.63.orig/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:05:07.093498489 +0200 ++++ blender-2.63/source/blender/windowmanager/intern/wm_operators.c 2012-05-08 00:10:59.325492259 +0200 +@@ -1627,12 +1627,13 @@ static int wm_open_mainfile_exec(bContex + G.fileflags &= ~G_FILE_NO_UI; + else + G.fileflags |= G_FILE_NO_UI; +- +- if (RNA_boolean_get(op->ptr, "use_scripts")) ++ ++ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */ ++ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF))) + G.f |= G_SCRIPT_AUTOEXEC; + else + G.f &= ~G_SCRIPT_AUTOEXEC; +- ++ + // XXX wm in context is not set correctly after WM_read_file -> crash + // do it before for now, but is this correct with multiple windows? + WM_event_add_notifier(C, NC_WINDOW, NULL); +@@ -1644,6 +1645,8 @@ static int wm_open_mainfile_exec(bContex + + static void WM_OT_open_mainfile(wmOperatorType *ot) + { ++ PropertyRNA * use_scripts_checkbox = NULL; ++ + ot->name = "Open Blender File"; + ot->idname = "WM_OT_open_mainfile"; + ot->description = "Open a Blender file"; +@@ -1656,8 +1659,12 @@ static void WM_OT_open_mainfile(wmOperat + WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); + + RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file"); +- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", ++ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts", ++ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source", + "Allow .blend file to execute scripts automatically, default available from system preferences"); ++ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */ ++ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF)) ++ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE); + } + + /* **************** link/append *************** */ +diff -Npur blender-2.63.orig/source/creator/creator.c blender-2.63/source/creator/creator.c +--- blender-2.63.orig/source/creator/creator.c 2012-05-08 00:05:06.987498491 +0200 ++++ blender-2.63/source/creator/creator.c 2012-05-08 00:11:37.213491621 +0200 +@@ -342,14 +342,14 @@ static int end_arguments(int UNUSED(argc + static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) + { + G.f |= G_SCRIPT_AUTOEXEC; +- G.f |= G_SCRIPT_OVERRIDE_PREF; ++ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ + return 0; + } + + static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) + { + G.f &= ~G_SCRIPT_AUTOEXEC; +- G.f |= G_SCRIPT_OVERRIDE_PREF; ++ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ + return 0; + } + diff --git a/media-gfx/blender/files/blender-2.63-bullet.patch b/media-gfx/blender/files/blender-2.63-bullet.patch new file mode 100644 index 0000000..b95f174 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-bullet.patch @@ -0,0 +1,193 @@ +diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py +--- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-07 23:11:26.396555426 +0200 ++++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-07 23:12:34.965554211 +0200 +@@ -270,6 +270,8 @@ def setup_syslibs(lenv): + syslibs += Split(lenv['BF_SDL_LIB']) + if not lenv['WITH_BF_STATICOPENGL']: + syslibs += Split(lenv['BF_OPENGL_LIB']) ++ if lenv['WITH_BF_BULLET']: ++ syslibs += Split(lenv['BF_BULLET_LIB']) + if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc', 'win64-mingw'): + syslibs += Split(lenv['BF_PTHREADS_LIB']) + if lenv['WITH_BF_COLLADA']: +Les fichiers binaires blender-2.63.orig/build_files/scons/tools/.Blender.py.swp et blender-2.63/build_files/scons/tools/.Blender.py.swp sont différents. +diff -Npur blender-2.63.orig/doc/doxygen/Doxyfile blender-2.63/doc/doxygen/Doxyfile +--- blender-2.63.orig/doc/doxygen/Doxyfile 2012-05-07 23:11:26.375555426 +0200 ++++ blender-2.63/doc/doxygen/Doxyfile 2012-05-07 23:13:03.593553708 +0200 +@@ -617,8 +617,7 @@ INPUT = doxygen.main \ + doxygen.intern \ + doxygen.extern \ + ../../source \ +- ../../intern \ +- ../../extern/bullet2 ++ ../../intern + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt +--- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:11:26.393555426 +0200 ++++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:13:17.988553449 +0200 +@@ -28,10 +28,6 @@ remove_strict_flags() + + add_subdirectory(colamd) + +-if(WITH_BULLET) +- add_subdirectory(bullet2) +-endif() +- + if(WITH_MOD_CLOTH_ELTOPO) + add_subdirectory(eltopo) + endif() +diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript +--- blender-2.63.orig/extern/SConscript 2012-05-07 23:11:26.392555426 +0200 ++++ blender-2.63/extern/SConscript 2012-05-07 23:14:02.743552661 +0200 +@@ -10,9 +10,6 @@ if env['WITH_BF_GAMEENGINE']: + if env['WITH_BF_ELTOPO']: + SConscript(['eltopo/SConscript']) + +-if env['WITH_BF_BULLET']: +- SConscript(['bullet2/src/SConscript']) +- + if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': + SConscript(['libredcode/SConscript']) + +diff -Npur blender-2.63.orig/intern/smoke/CMakeLists.txt blender-2.63/intern/smoke/CMakeLists.txt +--- blender-2.63.orig/intern/smoke/CMakeLists.txt 2012-05-07 23:11:26.588555423 +0200 ++++ blender-2.63/intern/smoke/CMakeLists.txt 2012-05-07 23:14:28.696552195 +0200 +@@ -26,10 +26,10 @@ + set(INC + intern + ../memutil +- ../../extern/bullet2/src + ) + + set(INC_SYS ++ /usr/include/bullet2 + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} + ) +diff -Npur blender-2.63.orig/intern/smoke/SConscript blender-2.63/intern/smoke/SConscript +--- blender-2.63.orig/intern/smoke/SConscript 2012-05-07 23:11:26.588555423 +0200 ++++ blender-2.63/intern/smoke/SConscript 2012-05-07 23:14:54.374551750 +0200 +@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']: + defs += ' PARALLEL=1' + + incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] +-incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' ++incs += ' intern /usr/include/bullet ../memutil ../guardealloc ' + + if env['WITH_BF_FFTW3']: + defs += ' WITH_FFTW3' +diff -Npur blender-2.63.orig/source/blender/blenkernel/CMakeLists.txt blender-2.63/source/blender/blenkernel/CMakeLists.txt +--- blender-2.63.orig/source/blender/blenkernel/CMakeLists.txt 2012-05-07 23:11:26.424555425 +0200 ++++ blender-2.63/source/blender/blenkernel/CMakeLists.txt 2012-05-07 23:15:38.670550966 +0200 +@@ -241,8 +241,8 @@ if(WITH_AUDASPACE) + endif() + + if(WITH_BULLET) +- list(APPEND INC +- ../../../extern/bullet2/src ++ list(APPEND INC_SYS ++ /usr/include/bullet + ) + add_definitions(-DUSE_BULLET) + endif() +diff -Npur blender-2.63.orig/source/blender/blenkernel/SConscript blender-2.63/source/blender/blenkernel/SConscript +--- blender-2.63.orig/source/blender/blenkernel/SConscript 2012-05-07 23:11:26.424555425 +0200 ++++ blender-2.63/source/blender/blenkernel/SConscript 2012-05-07 23:15:57.449550634 +0200 +@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make + incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' + incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' + incs += ' #/intern/iksolver/extern ../blenloader' +-incs += ' #/extern/bullet2/src' ++incs += ' /usr/include/bullet' + incs += ' #/intern/opennl/extern #/intern/bsp/extern' + incs += ' ../gpu #/extern/glew/include' + incs += ' ../bmesh' +diff -Npur blender-2.63.orig/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.63/source/gameengine/BlenderRoutines/CMakeLists.txt +--- blender-2.63.orig/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-05-07 23:11:26.402555426 +0200 ++++ blender-2.63/source/gameengine/BlenderRoutines/CMakeLists.txt 2012-05-07 23:16:28.027550096 +0200 +@@ -23,7 +23,6 @@ set(INC + ../../blender/makesdna + ../../blender/makesrna + ../../blender/windowmanager +- ../../../extern/bullet2/src + ../../../intern/container + ../../../intern/guardedalloc + ../../../intern/moto/include +@@ -32,7 +31,7 @@ set(INC + ) + + set(INC_SYS +- ++ /usr/include/bullet + ) + + set(SRC +diff -Npur blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63/source/gameengine/Converter/CMakeLists.txt +--- blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:11:26.407555426 +0200 ++++ blender-2.63/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:17:17.198549223 +0200 +@@ -49,7 +49,6 @@ set(INC + ../../blender/makesdna + ../../blender/makesrna + ../../blender/windowmanager +- ../../../extern/bullet2/src + ../../../intern/container + ../../../intern/guardedalloc + ../../../intern/moto/include +@@ -59,6 +58,7 @@ set(INC + + set(INC_SYS + /usr/include/eigen3 ++ /usr/include/bullet + ) + + set(SRC +diff -Npur blender-2.63.orig/source/gameengine/Ketsji/CMakeLists.txt blender-2.63/source/gameengine/Ketsji/CMakeLists.txt +--- blender-2.63.orig/source/gameengine/Ketsji/CMakeLists.txt 2012-05-07 23:11:26.414555426 +0200 ++++ blender-2.63/source/gameengine/Ketsji/CMakeLists.txt 2012-05-07 23:18:53.098547529 +0200 +@@ -241,9 +241,11 @@ endif() + + if(WITH_BULLET) + list(APPEND INC +- ../../../extern/bullet2/src + ../Physics/Bullet + ) ++ list(APPEND INC_SYS ++ /usr/include/bullet ++ ) + add_definitions(-DUSE_BULLET) + endif() + +diff -Npur blender-2.63.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.63/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +--- blender-2.63.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-05-07 23:11:26.402555426 +0200 ++++ blender-2.63/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2012-05-07 23:19:45.545546606 +0200 +@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied + + void CcdPhysicsEnvironment::exportFile(const char* filename) + { +- btDefaultSerializer* serializer = new btDefaultSerializer(); ++ // Workaround bullet-2.77 api change. ++ btDefaultSerializer* serializer = new btDefaultSerializer(0); + + + for (int i=0;igetNumCollisionObjects();i++) +diff -Npur blender-2.63.orig/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.63/source/gameengine/Physics/Bullet/CMakeLists.txt +--- blender-2.63.orig/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-05-07 23:11:26.402555426 +0200 ++++ blender-2.63/source/gameengine/Physics/Bullet/CMakeLists.txt 2012-05-07 23:20:13.314546112 +0200 +@@ -37,7 +37,6 @@ set(INC + ../../../blender/blenkernel + ../../../blender/blenlib + ../../../blender/makesdna +- ../../../../extern/bullet2/src + ../../../../intern/container + ../../../../intern/guardedalloc + ../../../../intern/moto/include +@@ -45,6 +44,7 @@ set(INC + ) + + set(INC_SYS ++ /usr/include/bullet + ${GLEW_INCLUDE_PATH} + ${PYTHON_INCLUDE_DIRS} + ) diff --git a/media-gfx/blender/files/blender-2.63-colamd.patch b/media-gfx/blender/files/blender-2.63-colamd.patch new file mode 100644 index 0000000..1053e7c --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-colamd.patch @@ -0,0 +1,199 @@ +diff -Npur blender-2.63.orig/build_files/scons/config/linux-config.py blender-2.63/build_files/scons/config/linux-config.py +--- blender-2.63.orig/build_files/scons/config/linux-config.py 2012-05-07 23:21:26.969544809 +0200 ++++ blender-2.63/build_files/scons/config/linux-config.py 2012-05-07 23:22:07.191544094 +0200 +@@ -192,6 +192,11 @@ BF_EXPAT = '/usr' + BF_EXPAT_LIB = 'expat' + BF_EXPAT_LIBPATH = '/usr/lib' + ++WITH_BF_COLAMD = True ++BF_COLAMD = '#extern/colamd' ++BF_COLAMD_INC = '${BF_COLAMD}/include' ++BF_COLAMD_LIB = 'extern_colamd' ++ + WITH_BF_JEMALLOC = False + WITH_BF_STATICJEMALLOC = False + BF_JEMALLOC = '/usr' +Les fichiers binaires blender-2.63.orig/build_files/scons/config/.linux-config.py.swp et blender-2.63/build_files/scons/config/.linux-config.py.swp sont différents. +diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py +--- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-07 23:21:26.969544809 +0200 ++++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-07 23:22:38.453543549 +0200 +@@ -281,6 +281,8 @@ def setup_syslibs(lenv): + else: + syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) + syslibs.append(lenv['BF_EXPAT_LIB']) ++ if lenv['WITH_BF_COLAMD']: ++ syslibs += Split(lenv['BF_COLAMD_LIB']) + + if lenv['WITH_BF_JEMALLOC']: + if not lenv['WITH_BF_STATICJEMALLOC']: +diff -Npur blender-2.63.orig/build_files/scons/tools/btools.py blender-2.63/build_files/scons/tools/btools.py +--- blender-2.63.orig/build_files/scons/tools/btools.py 2012-05-07 23:21:26.969544809 +0200 ++++ blender-2.63/build_files/scons/tools/btools.py 2012-05-07 23:23:38.652542481 +0200 +@@ -126,6 +126,7 @@ def validate_arguments(args, bc): + 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC', + 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', + 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH', ++ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB', + 'WITH_BF_PLAYER', + 'WITH_BF_NOBLENDER', + 'WITH_BF_BINRELOC', +@@ -455,6 +456,11 @@ def read_opts(env, cfg, args): + ('BF_EXPAT_LIB', 'Expat library', ''), + ('BF_EXPAT_LIBPATH', 'Expat library path', ''), + ++ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)), ++ ('BF_COLAMD', 'Colamd base dir', ''), ++ ('BF_COLAMD_INC', 'Colamd include path', ''), ++ ('BF_COLAMD_LIB', 'Colamd library', ''), ++ + (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)), + (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)), + ('BF_JEMALLOC', 'jemalloc base path', ''), +diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt +--- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:21:26.966544809 +0200 ++++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:24:02.363542061 +0200 +@@ -26,8 +26,6 @@ + # Otherwise we get warnings here that we cant fix in external projects + remove_strict_flags() + +-add_subdirectory(colamd) +- + if(WITH_MOD_CLOTH_ELTOPO) + add_subdirectory(eltopo) + endif() +diff -Npur blender-2.63.orig/extern/libmv/bundle.sh blender-2.63/extern/libmv/bundle.sh +--- blender-2.63.orig/extern/libmv/bundle.sh 2012-05-07 23:21:26.960544809 +0200 ++++ blender-2.63/extern/libmv/bundle.sh 2012-05-07 23:24:53.085541163 +0200 +@@ -122,13 +122,13 @@ set(INC + . + third_party/ssba + third_party/ldl/Include +- ../colamd/Include + ) + + set(INC_SYS + /usr/include/eigen3 + \${PNG_INCLUDE_DIR} + \${ZLIB_INCLUDE_DIRS} ++ \${COLAMD_INCLUDE_DIRS} + ) + + +@@ -247,6 +247,7 @@ $src + incs = '. /usr/include/eigen3' + incs += ' ' + env['BF_PNG_INC'] + incs += ' ' + env['BF_ZLIB_INC'] ++incs += ' ' + env['BF_COLAMD_INC'] + + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' +@@ -276,7 +277,7 @@ else: + ccflags_libmv += Split(env['REL_CCFLAGS']) + cxxflags_libmv += Split(env['REL_CXXFLAGS']) + +-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' ++incs += ' ./third_party/ssba ./third_party/ldl/Include' + + env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) + EOF +diff -Npur blender-2.63.orig/extern/libmv/CMakeLists.txt blender-2.63/extern/libmv/CMakeLists.txt +--- blender-2.63.orig/extern/libmv/CMakeLists.txt 2012-05-07 23:21:26.956544809 +0200 ++++ blender-2.63/extern/libmv/CMakeLists.txt 2012-05-07 23:25:16.647540750 +0200 +@@ -30,13 +30,13 @@ set(INC + . + third_party/ssba + third_party/ldl/Include +- ../colamd/Include + ) + + set(INC_SYS + /usr/include/eigen3 + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} ++ ${COLAMD_INCLUDE_DIRS} + ) + + +diff -Npur blender-2.63.orig/extern/libmv/SConscript blender-2.63/extern/libmv/SConscript +--- blender-2.63.orig/extern/libmv/SConscript 2012-05-07 23:21:26.956544809 +0200 ++++ blender-2.63/extern/libmv/SConscript 2012-05-07 23:25:46.051540228 +0200 +@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/* + incs = '. /usr/include/eigen3' + incs += ' ' + env['BF_PNG_INC'] + incs += ' ' + env['BF_ZLIB_INC'] ++incs += ' ' + env['BF_COLAMD_INC'] + + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): + incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' +@@ -62,6 +63,6 @@ else: + ccflags_libmv += Split(env['REL_CCFLAGS']) + cxxflags_libmv += Split(env['REL_CXXFLAGS']) + +-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' ++incs += ' ./third_party/ssba ./third_party/ldl/Include' + + env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) +diff -Npur blender-2.63.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp +--- blender-2.63.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-07 23:21:26.956544809 +0200 ++++ blender-2.63/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-07 23:26:21.833539593 +0200 +@@ -21,7 +21,7 @@ with SSBA. If not, see + extern "C" + { + //# include "LDL/Include/ldl.h" +diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript +--- blender-2.63.orig/extern/SConscript 2012-05-07 23:21:26.965544809 +0200 ++++ blender-2.63/extern/SConscript 2012-05-07 23:26:39.735539279 +0200 +@@ -2,8 +2,6 @@ + + Import('env') + +-SConscript(['colamd/SConscript']) +- + if env['WITH_BF_GAMEENGINE']: + SConscript(['recastnavigation/SConscript']) + +diff -Npur blender-2.63.orig/intern/opennl/CMakeLists.txt blender-2.63/intern/opennl/CMakeLists.txt +--- blender-2.63.orig/intern/opennl/CMakeLists.txt 2012-05-07 23:21:27.282544803 +0200 ++++ blender-2.63/intern/opennl/CMakeLists.txt 2012-05-07 23:27:00.719538907 +0200 +@@ -40,11 +40,10 @@ add_definitions( + set(INC + extern + superlu +- ../../extern/colamd/Include + ) + + set(INC_SYS +- ++ /usr/include + ) + + set(SRC +diff -Npur blender-2.63.orig/intern/opennl/SConscript blender-2.63/intern/opennl/SConscript +--- blender-2.63.orig/intern/opennl/SConscript 2012-05-07 23:21:27.281544803 +0200 ++++ blender-2.63/intern/opennl/SConscript 2012-05-07 23:27:25.132538477 +0200 +@@ -3,7 +3,7 @@ Import ('env') + + sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') + +-incs = 'extern superlu ../../extern/colamd/Include' ++incs = 'extern superlu /usr/include' + + if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')): + env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) +diff -Npur blender-2.63.orig/intern/opennl/superlu/get_perm_c.c blender-2.63/intern/opennl/superlu/get_perm_c.c +--- blender-2.63.orig/intern/opennl/superlu/get_perm_c.c 2012-05-07 23:21:27.281544803 +0200 ++++ blender-2.63/intern/opennl/superlu/get_perm_c.c 2012-05-07 23:27:42.876538164 +0200 +@@ -10,7 +10,7 @@ + */ + + #include "ssp_defs.h" +-#include "colamd.h" ++#include + + extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, + int *, int *, int *, int *, int *); diff --git a/media-gfx/blender/files/blender-2.63-collada.patch b/media-gfx/blender/files/blender-2.63-collada.patch new file mode 100644 index 0000000..7823109 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-collada.patch @@ -0,0 +1,11 @@ +--- source/blender/collada/SConscript 2012-01-16 19:04:02.438027832 +0100 ++++ source/blender/collada/SConscript 2012-01-16 19:03:59.787060970 +0100 +@@ -34,7 +34,7 @@ + if env['OURPLATFORM']=='darwin': + incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + else: +- incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) ++ incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC']) + + if env['BF_BUILDINFO']: + defs.append('WITH_BUILDINFO') diff --git a/media-gfx/blender/files/blender-2.63-desktop.patch b/media-gfx/blender/files/blender-2.63-desktop.patch new file mode 100644 index 0000000..d325055 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-desktop.patch @@ -0,0 +1,22 @@ +diff -Npur blender-2.63.orig/release/freedesktop/blender.desktop blender-2.63/release/freedesktop/blender.desktop +--- blender-2.63.orig/release/freedesktop/blender.desktop 2012-05-08 12:07:59.399731724 +0200 ++++ blender-2.63/release/freedesktop/blender.desktop 2012-05-08 12:09:29.185730134 +0200 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=Blender ++Name=Blender-2.63 + GenericName=3D modeller + GenericName[es]=modelador 3D + GenericName[de]=3D-Modellierer +@@ -8,8 +8,9 @@ GenericName[ru]=Редактор 3D-мо + Comment=3D modeling, animation, rendering and post-production + Comment[es]=modelado 3D, animación, renderizado y post-producción + Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung +-Exec=blender +-Icon=blender ++Comment[fr]=modeleur 3D, animation, rendu et post-production ++Exec=blender-2.63 %f ++Icon=blender-2.63 + Terminal=false + Type=Application + Categories=Graphics;3DGraphics; diff --git a/media-gfx/blender/files/blender-2.63-doxyfile.patch b/media-gfx/blender/files/blender-2.63-doxyfile.patch new file mode 100644 index 0000000..e7d045a --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-doxyfile.patch @@ -0,0 +1,13 @@ +diff -Npur blender-2.63.orig/doc/doxygen/Doxyfile blender-2.63/doc/doxygen/Doxyfile +--- blender-2.63.orig/doc/doxygen/Doxyfile 2012-05-07 23:00:09.494567393 +0200 ++++ blender-2.63/doc/doxygen/Doxyfile 2012-05-07 23:00:39.390566856 +0200 +@@ -952,7 +952,7 @@ CHM_FILE = blender.chm + # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run + # the HTML help compiler on the generated index.hhp. + +-HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" ++HHC_LOCATION = + + # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag + # controls if a separate .chi index file is generated (YES) or that +Les fichiers binaires blender-2.63.orig/doc/doxygen/.Doxyfile.swp et blender-2.63/doc/doxygen/.Doxyfile.swp sont différents. diff --git a/media-gfx/blender/files/blender-2.63-eigen.patch b/media-gfx/blender/files/blender-2.63-eigen.patch new file mode 100644 index 0000000..1990e0c --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-eigen.patch @@ -0,0 +1,556 @@ +diff -Npur blender-2.63.orig/extern/libmv/bundle.sh blender-2.63/extern/libmv/bundle.sh +--- blender-2.63.orig/extern/libmv/bundle.sh 2012-05-07 23:04:15.864563037 +0200 ++++ blender-2.63/extern/libmv/bundle.sh 2012-05-07 23:05:15.112561992 +0200 +@@ -120,13 +120,13 @@ cat > CMakeLists.txt << EOF + + set(INC + . +- ../Eigen3 + third_party/ssba + third_party/ldl/Include + ../colamd/Include + ) + + set(INC_SYS ++ /usr/include/eigen3 + \${PNG_INCLUDE_DIR} + \${ZLIB_INCLUDE_DIRS} + ) +@@ -244,7 +244,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=') + src = env.Glob("*.cpp") + $src + +-incs = '. ../Eigen3' ++incs = '. /usr/include/eigen3' + incs += ' ' + env['BF_PNG_INC'] + incs += ' ' + env['BF_ZLIB_INC'] + +diff -Npur blender-2.63.orig/extern/libmv/CMakeLists.txt blender-2.63/extern/libmv/CMakeLists.txt +--- blender-2.63.orig/extern/libmv/CMakeLists.txt 2012-05-07 23:04:15.860563037 +0200 ++++ blender-2.63/extern/libmv/CMakeLists.txt 2012-05-07 23:05:34.148561654 +0200 +@@ -28,13 +28,13 @@ + + set(INC + . +- ../Eigen3 + third_party/ssba + third_party/ldl/Include + ../colamd/Include + ) + + set(INC_SYS ++ /usr/include/eigen3 + ${PNG_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIRS} + ) +diff -Npur blender-2.63.orig/extern/libmv/SConscript blender-2.63/extern/libmv/SConscript +--- blender-2.63.orig/extern/libmv/SConscript 2012-05-07 23:04:15.860563037 +0200 ++++ blender-2.63/extern/libmv/SConscript 2012-05-07 23:05:51.208561352 +0200 +@@ -30,7 +30,7 @@ src += env.Glob('third_party/ldl/Source/ + src += env.Glob('third_party/ssba/Geometry/*.cpp') + src += env.Glob('third_party/ssba/Math/*.cpp') + +-incs = '. ../Eigen3' ++incs = '. /usr/include/eigen3' + incs += ' ' + env['BF_PNG_INC'] + incs += ' ' + env['BF_ZLIB_INC'] + +diff -Npur blender-2.63.orig/intern/dualcon/SConscript blender-2.63/intern/dualcon/SConscript +--- blender-2.63.orig/intern/dualcon/SConscript 2012-05-07 23:04:16.045563034 +0200 ++++ blender-2.63/intern/dualcon/SConscript 2012-05-07 23:10:26.690556512 +0200 +@@ -3,7 +3,7 @@ Import ('env') + + sources = env.Glob('intern/*.cpp') + +-incs = '. ../../extern/Eigen3' ++incs = '. /usr/include/eigen3' + defs = '' + + env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] ) +Les fichiers binaires blender-2.63.orig/intern/dualcon/.SConscript.swp et blender-2.63/intern/dualcon/.SConscript.swp sont différents. +diff -Npur blender-2.63.orig/intern/itasc/CMakeLists.txt blender-2.63/intern/itasc/CMakeLists.txt +--- blender-2.63.orig/intern/itasc/CMakeLists.txt 2012-05-07 23:04:16.048563034 +0200 ++++ blender-2.63/intern/itasc/CMakeLists.txt 2012-05-07 23:07:37.219559480 +0200 +@@ -24,11 +24,11 @@ + # ***** END GPL LICENSE BLOCK ***** + + set(INC +- ../../extern/Eigen3 ++ + ) + + set(INC_SYS +- ++ /usr/include/eigen3 + ) + + set(SRC +@@ -121,201 +121,201 @@ set(SRC + kdl/framevel.inl + + # until we have another user... +- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h +- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h +- ../../extern/Eigen3/Eigen/src/misc/Kernel.h +- ../../extern/Eigen3/Eigen/src/misc/Image.h +- ../../extern/Eigen3/Eigen/src/misc/Solve.h +- ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h +- ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h +- ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h +- ../../extern/Eigen3/Eigen/src/StlSupport/details.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h +- ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h +- ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h +- ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h +- ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h +- ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h +- ../../extern/Eigen3/Eigen/src/Householder/Householder.h +- ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h +- ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h +- ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h +- ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h +- ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h +- ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h +- ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h +- ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h +- ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h +- ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h +- ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h +- ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h +- ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h +- ../../extern/Eigen3/Eigen/src/Geometry/Translation.h +- ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h +- ../../extern/Eigen3/Eigen/src/Geometry/Transform.h +- ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h +- ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h +- ../../extern/Eigen3/Eigen/src/LU/Determinant.h +- ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h +- ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h +- ../../extern/Eigen3/Eigen/src/LU/Inverse.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseVector.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h +- ../../extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h +- ../../extern/Eigen3/Eigen/src/Sparse/AmbiVector.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseBlock.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/Sparse/CoreIterators.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseAssign.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseDot.h +- ../../extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseRedux.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseView.h +- ../../extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseUtil.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h +- ../../extern/Eigen3/Eigen/src/Sparse/SparseProduct.h +- ../../extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h +- ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h +- ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h +- ../../extern/Eigen3/Eigen/src/Core/Swap.h +- ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h +- ../../extern/Eigen3/Eigen/src/Core/DenseBase.h +- ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/ProductBase.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/Stride.h +- ../../extern/Eigen3/Eigen/src/Core/Matrix.h +- ../../extern/Eigen3/Eigen/src/Core/Visitor.h +- ../../extern/Eigen3/Eigen/src/Core/Array.h +- ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h +- ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/EigenBase.h +- ../../extern/Eigen3/Eigen/src/Core/Random.h +- ../../extern/Eigen3/Eigen/src/Core/Redux.h +- ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h +- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h +- ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h +- ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h +- ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h +- ../../extern/Eigen3/Eigen/src/Core/util/Memory.h +- ../../extern/Eigen3/Eigen/src/Core/util/Meta.h +- ../../extern/Eigen3/Eigen/src/Core/util/Constants.h +- ../../extern/Eigen3/Eigen/src/Core/util/Macros.h +- ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h +- ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h +- ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h +- ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h +- ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h +- ../../extern/Eigen3/Eigen/src/Core/Transpositions.h +- ../../extern/Eigen3/Eigen/src/Core/Select.h +- ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h +- ../../extern/Eigen3/Eigen/src/Core/Dot.h +- ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h +- ../../extern/Eigen3/Eigen/src/Core/Product.h +- ../../extern/Eigen3/Eigen/src/Core/Transpose.h +- ../../extern/Eigen3/Eigen/src/Core/Block.h +- ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h +- ../../extern/Eigen3/Eigen/src/Core/MapBase.h +- ../../extern/Eigen3/Eigen/src/Core/NoAlias.h +- ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h +- ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h +- ../../extern/Eigen3/Eigen/src/Core/IO.h +- ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/Reverse.h +- ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h +- ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h +- ../../extern/Eigen3/Eigen/src/Core/StableNorm.h +- ../../extern/Eigen3/Eigen/src/Core/NumTraits.h +- ../../extern/Eigen3/Eigen/src/Core/Map.h +- ../../extern/Eigen3/Eigen/src/Core/Functors.h +- ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h +- ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h +- ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h +- ../../extern/Eigen3/Eigen/src/Core/NestByValue.h +- ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h +- ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h +- ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h +- ../../extern/Eigen3/Eigen/src/Core/Diagonal.h +- ../../extern/Eigen3/Eigen/src/Core/Replicate.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h +- ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h +- ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h +- ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h +- ../../extern/Eigen3/Eigen/src/Core/Assign.h +- ../../extern/Eigen3/Eigen/src/Core/Flagged.h +- ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h +- ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h ++ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h ++ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h ++ /usr/include/eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h ++ /usr/include/eigen3/Eigen/src/plugins/BlockMethods.h ++ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h ++ /usr/include/eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h ++ /usr/include/eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h ++ /usr/include/eigen3/Eigen/src/misc/Kernel.h ++ /usr/include/eigen3/Eigen/src/misc/Image.h ++ /usr/include/eigen3/Eigen/src/misc/Solve.h ++ /usr/include/eigen3/Eigen/src/QR/HouseholderQR.h ++ /usr/include/eigen3/Eigen/src/QR/ColPivHouseholderQR.h ++ /usr/include/eigen3/Eigen/src/QR/FullPivHouseholderQR.h ++ /usr/include/eigen3/Eigen/src/StlSupport/details.h ++ /usr/include/eigen3/Eigen/src/StlSupport/StdList.h ++ /usr/include/eigen3/Eigen/src/StlSupport/StdDeque.h ++ /usr/include/eigen3/Eigen/src/StlSupport/StdVector.h ++ /usr/include/eigen3/Eigen/src/SVD/UpperBidiagonalization.h ++ /usr/include/eigen3/Eigen/src/SVD/JacobiSVD.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/ComplexSchur.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/RealSchur.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h ++ /usr/include/eigen3/Eigen/src/Eigenvalues/EigenSolver.h ++ /usr/include/eigen3/Eigen/src/Jacobi/Jacobi.h ++ /usr/include/eigen3/Eigen/src/Householder/Householder.h ++ /usr/include/eigen3/Eigen/src/Householder/BlockHouseholder.h ++ /usr/include/eigen3/Eigen/src/Householder/HouseholderSequence.h ++ /usr/include/eigen3/Eigen/src/Geometry/RotationBase.h ++ /usr/include/eigen3/Eigen/src/Geometry/Rotation2D.h ++ /usr/include/eigen3/Eigen/src/Geometry/Homogeneous.h ++ /usr/include/eigen3/Eigen/src/Geometry/Hyperplane.h ++ /usr/include/eigen3/Eigen/src/Geometry/EulerAngles.h ++ /usr/include/eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h ++ /usr/include/eigen3/Eigen/src/Geometry/ParametrizedLine.h ++ /usr/include/eigen3/Eigen/src/Geometry/OrthoMethods.h ++ /usr/include/eigen3/Eigen/src/Geometry/AngleAxis.h ++ /usr/include/eigen3/Eigen/src/Geometry/Umeyama.h ++ /usr/include/eigen3/Eigen/src/Geometry/Scaling.h ++ /usr/include/eigen3/Eigen/src/Geometry/Translation.h ++ /usr/include/eigen3/Eigen/src/Geometry/AlignedBox.h ++ /usr/include/eigen3/Eigen/src/Geometry/Transform.h ++ /usr/include/eigen3/Eigen/src/Geometry/Quaternion.h ++ /usr/include/eigen3/Eigen/src/LU/PartialPivLU.h ++ /usr/include/eigen3/Eigen/src/LU/Determinant.h ++ /usr/include/eigen3/Eigen/src/LU/arch/Inverse_SSE.h ++ /usr/include/eigen3/Eigen/src/LU/FullPivLU.h ++ /usr/include/eigen3/Eigen/src/LU/Inverse.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrixBase.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseVector.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h ++ /usr/include/eigen3/Eigen/src/Sparse/TriangularSolver.h ++ /usr/include/eigen3/Eigen/src/Sparse/AmbiVector.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseDenseProduct.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseBlock.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseTriangularView.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h ++ /usr/include/eigen3/Eigen/src/Sparse/CoreIterators.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseMatrix.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseAssign.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseSparseProduct.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseDot.h ++ /usr/include/eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseRedux.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseFuzzy.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseView.h ++ /usr/include/eigen3/Eigen/src/Sparse/MappedSparseMatrix.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseUtil.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseTranspose.h ++ /usr/include/eigen3/Eigen/src/Sparse/SparseProduct.h ++ /usr/include/eigen3/Eigen/src/Sparse/CompressedStorage.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Cwise.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/TriangularSolver.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/QR.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Lazy.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Memory.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/SVD.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/CwiseOperators.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/VectorBlock.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Meta.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Macros.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/LeastSquares.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/LU.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Block.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/All.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/Minor.h ++ /usr/include/eigen3/Eigen/src/Eigen2Support/MathFunctions.h ++ /usr/include/eigen3/Eigen/src/Core/SelfAdjointView.h ++ /usr/include/eigen3/Eigen/src/Core/MatrixBase.h ++ /usr/include/eigen3/Eigen/src/Core/Swap.h ++ /usr/include/eigen3/Eigen/src/Core/DenseCoeffsBase.h ++ /usr/include/eigen3/Eigen/src/Core/DenseBase.h ++ /usr/include/eigen3/Eigen/src/Core/GlobalFunctions.h ++ /usr/include/eigen3/Eigen/src/Core/ProductBase.h ++ /usr/include/eigen3/Eigen/src/Core/CwiseBinaryOp.h ++ /usr/include/eigen3/Eigen/src/Core/Stride.h ++ /usr/include/eigen3/Eigen/src/Core/Matrix.h ++ /usr/include/eigen3/Eigen/src/Core/Visitor.h ++ /usr/include/eigen3/Eigen/src/Core/Array.h ++ /usr/include/eigen3/Eigen/src/Core/ReturnByValue.h ++ /usr/include/eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h ++ /usr/include/eigen3/Eigen/src/Core/EigenBase.h ++ /usr/include/eigen3/Eigen/src/Core/Random.h ++ /usr/include/eigen3/Eigen/src/Core/Redux.h ++ /usr/include/eigen3/Eigen/src/Core/arch/Default/Settings.h ++ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h ++ /usr/include/eigen3/Eigen/src/Core/arch/AltiVec/Complex.h ++ /usr/include/eigen3/Eigen/src/Core/arch/NEON/PacketMath.h ++ /usr/include/eigen3/Eigen/src/Core/arch/NEON/Complex.h ++ /usr/include/eigen3/Eigen/src/Core/arch/SSE/PacketMath.h ++ /usr/include/eigen3/Eigen/src/Core/arch/SSE/Complex.h ++ /usr/include/eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h ++ /usr/include/eigen3/Eigen/src/Core/BooleanRedux.h ++ /usr/include/eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h ++ /usr/include/eigen3/Eigen/src/Core/util/BlasUtil.h ++ /usr/include/eigen3/Eigen/src/Core/util/Memory.h ++ /usr/include/eigen3/Eigen/src/Core/util/Meta.h ++ /usr/include/eigen3/Eigen/src/Core/util/Constants.h ++ /usr/include/eigen3/Eigen/src/Core/util/Macros.h ++ /usr/include/eigen3/Eigen/src/Core/util/ForwardDeclarations.h ++ /usr/include/eigen3/Eigen/src/Core/util/StaticAssert.h ++ /usr/include/eigen3/Eigen/src/Core/util/DisableStupidWarnings.h ++ /usr/include/eigen3/Eigen/src/Core/util/XprHelper.h ++ /usr/include/eigen3/Eigen/src/Core/VectorBlock.h ++ /usr/include/eigen3/Eigen/src/Core/Transpositions.h ++ /usr/include/eigen3/Eigen/src/Core/Select.h ++ /usr/include/eigen3/Eigen/src/Core/BandMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryView.h ++ /usr/include/eigen3/Eigen/src/Core/Dot.h ++ /usr/include/eigen3/Eigen/src/Core/GenericPacketMath.h ++ /usr/include/eigen3/Eigen/src/Core/Product.h ++ /usr/include/eigen3/Eigen/src/Core/Transpose.h ++ /usr/include/eigen3/Eigen/src/Core/Block.h ++ /usr/include/eigen3/Eigen/src/Core/ArrayWrapper.h ++ /usr/include/eigen3/Eigen/src/Core/MapBase.h ++ /usr/include/eigen3/Eigen/src/Core/NoAlias.h ++ /usr/include/eigen3/Eigen/src/Core/ForceAlignedAccess.h ++ /usr/include/eigen3/Eigen/src/Core/PlainObjectBase.h ++ /usr/include/eigen3/Eigen/src/Core/IO.h ++ /usr/include/eigen3/Eigen/src/Core/DiagonalMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/CwiseUnaryOp.h ++ /usr/include/eigen3/Eigen/src/Core/Reverse.h ++ /usr/include/eigen3/Eigen/src/Core/Fuzzy.h ++ /usr/include/eigen3/Eigen/src/Core/DenseStorage.h ++ /usr/include/eigen3/Eigen/src/Core/StableNorm.h ++ /usr/include/eigen3/Eigen/src/Core/NumTraits.h ++ /usr/include/eigen3/Eigen/src/Core/Map.h ++ /usr/include/eigen3/Eigen/src/Core/Functors.h ++ /usr/include/eigen3/Eigen/src/Core/PermutationMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/ArrayBase.h ++ /usr/include/eigen3/Eigen/src/Core/CwiseNullaryOp.h ++ /usr/include/eigen3/Eigen/src/Core/SolveTriangular.h ++ /usr/include/eigen3/Eigen/src/Core/NestByValue.h ++ /usr/include/eigen3/Eigen/src/Core/DiagonalProduct.h ++ /usr/include/eigen3/Eigen/src/Core/CommaInitializer.h ++ /usr/include/eigen3/Eigen/src/Core/MathFunctions.h ++ /usr/include/eigen3/Eigen/src/Core/Diagonal.h ++ /usr/include/eigen3/Eigen/src/Core/Replicate.h ++ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointProduct.h ++ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixVector.h ++ /usr/include/eigen3/Eigen/src/Core/products/CoeffBasedProduct.h ++ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h ++ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h ++ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h ++ /usr/include/eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/products/Parallelizer.h ++ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/products/TriangularSolverVector.h ++ /usr/include/eigen3/Eigen/src/Core/products/TriangularMatrixVector.h ++ /usr/include/eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h ++ /usr/include/eigen3/Eigen/src/Core/TriangularMatrix.h ++ /usr/include/eigen3/Eigen/src/Core/VectorwiseOp.h ++ /usr/include/eigen3/Eigen/src/Core/Assign.h ++ /usr/include/eigen3/Eigen/src/Core/Flagged.h ++ /usr/include/eigen3/Eigen/src/Cholesky/LDLT.h ++ /usr/include/eigen3/Eigen/src/Cholesky/LLT.h + ) + + if(WIN32) +diff -Npur blender-2.63.orig/intern/itasc/SConscript blender-2.63/intern/itasc/SConscript +--- blender-2.63.orig/intern/itasc/SConscript 2012-05-07 23:04:16.048563034 +0200 ++++ blender-2.63/intern/itasc/SConscript 2012-05-07 23:08:05.272558981 +0200 +@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') + sources += env.Glob('kdl/*.cpp') + sources += env.Glob('kdl/utilities/*.cpp') + +-incs = '. ../../extern/Eigen3' ++incs = '. /usr/include/eigen3' + + defs = [] + +diff -Npur blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt blender-2.63/source/blender/ikplugin/CMakeLists.txt +--- blender-2.63.orig/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:04:16.028563034 +0200 ++++ blender-2.63/source/blender/ikplugin/CMakeLists.txt 2012-05-07 23:08:47.476558205 +0200 +@@ -49,9 +49,11 @@ set(SRC + if(WITH_IK_ITASC) + add_definitions(-DWITH_IK_ITASC) + list(APPEND INC +- ../../../extern/Eigen3 + ../../../intern/itasc + ) ++ list(APPEND INC_SYS ++ /usr/include/eigen3 ++ ) + list(APPEND SRC + intern/itasc_plugin.cpp + ) +diff -Npur blender-2.63.orig/source/blender/ikplugin/SConscript blender-2.63/source/blender/ikplugin/SConscript +--- blender-2.63.orig/source/blender/ikplugin/SConscript 2012-05-07 23:04:16.028563034 +0200 ++++ blender-2.63/source/blender/ikplugin/SConscript 2012-05-07 23:09:13.004557784 +0200 +@@ -4,7 +4,7 @@ defs = [] + sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') + + incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib' +-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3' ++incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3' + + defs.append('WITH_IK_ITASC') + +diff -Npur blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt blender-2.63/source/gameengine/Converter/CMakeLists.txt +--- blender-2.63.orig/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:04:15.895563037 +0200 ++++ blender-2.63/source/gameengine/Converter/CMakeLists.txt 2012-05-07 23:09:46.375557194 +0200 +@@ -50,7 +50,6 @@ set(INC + ../../blender/makesrna + ../../blender/windowmanager + ../../../extern/bullet2/src +- ../../../extern/Eigen3 + ../../../intern/container + ../../../intern/guardedalloc + ../../../intern/moto/include +@@ -59,7 +58,7 @@ set(INC + ) + + set(INC_SYS +- ++ /usr/include/eigen3 + ) + + set(SRC +diff -Npur blender-2.63.orig/source/gameengine/Converter/SConscript blender-2.63/source/gameengine/Converter/SConscript +--- blender-2.63.orig/source/gameengine/Converter/SConscript 2012-05-07 23:04:15.895563037 +0200 ++++ blender-2.63/source/gameengine/Converter/SConscript 2012-05-07 23:10:09.611556783 +0200 +@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager' + incs += ' #source/blender/makesrna' + incs += ' #source/blender/ikplugin' + incs += ' #extern/recastnavigation/Detour/Include' +-incs += ' #extern/Eigen3' ++incs += ' /usr/include/eigen3' + + incs += ' ' + env['BF_BULLET_INC'] + diff --git a/media-gfx/blender/files/blender-2.63-enable_site_module.patch b/media-gfx/blender/files/blender-2.63-enable_site_module.patch new file mode 100644 index 0000000..2d6ca00 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-enable_site_module.patch @@ -0,0 +1,34 @@ +diff -Npur blender-2.63.orig/source/blender/python/intern/bpy_interface.c blender-2.63/source/blender/python/intern/bpy_interface.c +--- blender-2.63.orig/source/blender/python/intern/bpy_interface.c 2012-05-08 00:14:54.141488111 +0200 ++++ blender-2.63/source/blender/python/intern/bpy_interface.c 2012-05-08 00:15:14.861487739 +0200 +@@ -241,11 +241,6 @@ void BPY_python_start(int argc, const ch + * blender is utf-8 too - campbell */ + BLI_setenv("PYTHONIOENCODING", "utf-8:surrogateescape"); + +- /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to +- * parse from the 'sysconfig' module which is used by 'site', +- * so for now disable site. alternatively we could copy the file. */ +- Py_NoSiteFlag = 1; +- + Py_Initialize(); + + // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal +diff -Npur blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp +--- blender-2.63.orig/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:14:54.118488110 +0200 ++++ blender-2.63/source/gameengine/Ketsji/KX_PythonInit.cpp 2012-05-08 00:15:23.305487596 +0200 +@@ -1848,7 +1848,6 @@ PyObject* initGamePlayerPythonScripting( + STR_String pname = progname; + Py_SetProgramName(pname.Ptr()); + #endif +- Py_NoSiteFlag=1; + Py_FrozenFlag=1; + + /* must run before python initializes */ +@@ -1929,7 +1928,6 @@ PyObject* initGamePythonScripting(const + STR_String pname = progname; + Py_SetProgramName(pname.Ptr()); + #endif +- Py_NoSiteFlag=1; + Py_FrozenFlag=1; + + #ifdef WITH_AUDASPACE diff --git a/media-gfx/blender/files/blender-2.63-glew.patch b/media-gfx/blender/files/blender-2.63-glew.patch new file mode 100644 index 0000000..736bedd --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-glew.patch @@ -0,0 +1,49 @@ +diff -Npur blender-2.63.orig/CMakeLists.txt blender-2.63/CMakeLists.txt +--- blender-2.63.orig/CMakeLists.txt 2012-05-07 23:02:18.166565118 +0200 ++++ blender-2.63/CMakeLists.txt 2012-05-07 23:02:45.907564652 +0200 +@@ -160,7 +160,7 @@ unset(PLATFORM_DEFAULT) + if(UNIX AND NOT APPLE) + option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) + option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) +- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) ++ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF) + option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF) + mark_as_advanced(WITH_XDG_USER_DIRS) + +diff -Npur blender-2.63.orig/extern/CMakeLists.txt blender-2.63/extern/CMakeLists.txt +--- blender-2.63.orig/extern/CMakeLists.txt 2012-05-07 23:02:18.134565119 +0200 ++++ blender-2.63/extern/CMakeLists.txt 2012-05-07 23:02:58.458564406 +0200 +@@ -40,10 +40,6 @@ if(WITH_BINRELOC) + add_subdirectory(binreloc) + endif() + +-if(WITH_BUILTIN_GLEW) +- add_subdirectory(glew) +-endif() +- + if(WITH_GAMEENGINE) + add_subdirectory(recastnavigation) + endif() +diff -Npur blender-2.63.orig/extern/SConscript blender-2.63/extern/SConscript +--- blender-2.63.orig/extern/SConscript 2012-05-07 23:02:18.132565119 +0200 ++++ blender-2.63/extern/SConscript 2012-05-07 23:03:14.094564130 +0200 +@@ -2,7 +2,6 @@ + + Import('env') + +-SConscript(['glew/SConscript']) + SConscript(['colamd/SConscript']) + + if env['WITH_BF_GAMEENGINE']: +diff -Npur blender-2.63.orig/source/blender/editors/include/BIF_gl.h blender-2.63/source/blender/editors/include/BIF_gl.h +--- blender-2.63.orig/source/blender/editors/include/BIF_gl.h 2012-05-07 23:02:18.433565114 +0200 ++++ blender-2.63/source/blender/editors/include/BIF_gl.h 2012-05-07 23:03:35.555563750 +0200 +@@ -33,7 +33,7 @@ + #ifndef __BIF_GL_H__ + #define __BIF_GL_H__ + +-#include "GL/glew.h" ++#include + + /* + * these should be phased out. cpack should be replaced in diff --git a/media-gfx/blender/files/blender-2.63-insecure.desktop b/media-gfx/blender/files/blender-2.63-insecure.desktop new file mode 100644 index 0000000..5658065 --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-insecure.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Name=Blender-2.63 (reduced security) +GenericName=3D modeller (reduced security) +GenericName[es]=modelador 3D (reduced security) +GenericName[de]=3D Modellierer (weniger Sicherheit) +GenericName[fr]=modeleur 3D (reduced security) +GenericName[ru]=Редактор 3D-моделей (reduced security) +Comment=3D modeling, animation, rendering and post-production +Comment[es]=modelado 3D, animación, renderizado y post-producción +Comment[de]=3D-Modellierung, Animation, Rendering und Nachbearbeitung +Comment[fr]=modeleur 3D, animation, rendu et post-production +Exec=blender-2.63 --enable-autoexec %f +Icon=blender-2.63 +Terminal=false +Type=Application +Categories=Graphics;3DGraphics; +MimeType=application/x-blender; diff --git a/media-gfx/blender/files/blender-2.63-opencollada-debug.patch b/media-gfx/blender/files/blender-2.63-opencollada-debug.patch new file mode 100644 index 0000000..0798cfd --- /dev/null +++ b/media-gfx/blender/files/blender-2.63-opencollada-debug.patch @@ -0,0 +1,15 @@ +diff -Npur blender-2.63.orig/build_files/scons/tools/Blender.py blender-2.63/build_files/scons/tools/Blender.py +--- blender-2.63.orig/build_files/scons/tools/Blender.py 2012-05-08 00:15:58.091486980 +0200 ++++ blender-2.63/build_files/scons/tools/Blender.py 2012-05-08 00:17:01.805485854 +0200 +@@ -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'] and (lenv['OURPLATFORM'] != 'linux'): +- 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']) -- cgit v1.2.3-65-gdbad