Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (b1dba55eb716334b9633353bd2cb1f915588e6a2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (b1dba55eb716334b9633353bd2cb1f915588e6a2)
  • Date: Tue, 22 Nov 2011 19:48:00 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

dev/null |binary
graphics/blender/BUILD | 49 ++
graphics/blender/CONFIGURE | 12
graphics/blender/DEPENDS | 137 +++++--
graphics/blender/DETAILS | 21 -
graphics/blender/FINAL | 2
graphics/blender/HISTORY | 12
graphics/blender/INSTALL | 117 +++++-
graphics/blender/PREPARE | 2
graphics/blender/PRE_BUILD | 52 ++
graphics/blender/blender-2.44-scriptsdir.patch | 91 ----
graphics/blender/blender-2.60-bmake.patch | 114 ++++++
graphics/blender/blender-2.60-doxyfile.patch | 11
graphics/blender/blender-2.60-eigen.patch | 293
++++++++++++++++
graphics/blender/blender-2.60-glew.patch | 48 ++
graphics/blender/blender-2.60-openjpeg.patch | 37 ++
graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch | 149 ++++++++
graphics/blender/blender-2.60a-desktop.patch | 20 +
graphics/blender/blender-2.60a-enable_site_module.patch | 32 +
graphics/blender/blender-2.60a-libav-0.7.patch | 30 +
graphics/blender/blender-2.60a-linux-3.patch | 12
graphics/blender/blender-2.60a.tar.gz.sig |binary
graphics/blender/blender48x48.png | 0
graphics/blender/desktop/blender.desktop | 15
24 files changed, 1081 insertions(+), 175 deletions(-)

New commits:
commit b1dba55eb716334b9633353bd2cb1f915588e6a2
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

blender: updated to 2.60a

diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index 6d241dc..bb6d1c5 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -1,11 +1,42 @@
-if list_find "$OPTS" "WITH_BF_ODE=1"; then
- sed -i "s:LIBDIR + '/ode':\'$INSTALL_ROOT/usr\':" config/linux2-config.py
-fi &&
+if [ "$BLENDER_PLAYER" == "WITH_BF_PLAYER=True" ]; then
+ BLENDER_GAMEENGINE="WITH_BF_GAMEENGINE=True"
+fi &&

-scons BF_INSTALLDIR="$SOURCE_DIRECTORY/install" \
- WITH_BF_INTERNATIONAL=1 \
- WITH_BF_PLAYER=1 \
- WITH_BF_GAMEENGINE=1 \
- $OPTS &&
+if is_depends_enabled $SPELL openjpeg; then

-make -C "$SOURCE_DIRECTORY/install/plugins"
+cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
+BF_OPENJPEG="/usr"
+BF_OPENJPEG_INC="/usr/include"
+BF_OPENJPEG_LIB="openjpeg"
+EOF
+
+fi &&
+
+if is_depends_enabled $SPELL lcms; then
+
+cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
+BF_LCMS_INC="/usr/include/"
+BF_LCMS_LIB="lcms"
+BF_LCMS_LIBPATH="/usr/lib/"
+EOF
+
+fi &&
+
+echo "CFLAGS=[`for i in ${CFLAGS[@]}; do printf "%s \'$i"\',; done`] " \
+ | sed -e "s:,]: ]:" >> "${SOURCE_DIRECTORY}"/user-config.py
+
+local FILTERED_CXXFLAGS="`for i in ${CXXFLAGS[@]}; do printf "%s \'$i"\',;
done`"
+echo "CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
+echo "BGE_CXXFLAGS=[${FILTERED_CXXFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
+
+echo "CCFLAGS= ['-funsigned-char', '-D_LARGEFILE_SOURCE',
'-D_FILE_OFFSET_BITS=64']" >> "${SOURCE_DIRECTORY}"/user-config.py
+
+local FILTERED_LDFLAGS="`for i in ${LDFLAGS[@]}; do printf "%s \'$i"\',;
done`"
+echo "LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
+echo "PLATFORM_LINKFLAGS=[${FILTERED_LDFLAGS}]" | sed -e "s:,]: ]:" >>
"${SOURCE_DIRECTORY}"/user-config.py
+
+OPTS="WITHOUT_BF_PYTHON_INSTALL=True WITH_BF_3DMOUSE=False $BLENDER_PLAYER
$BLENDER_GAMEENGINE $BLENDER_OGG $OPTS"
+
+python ./scons/scons.py $OPTS
+
+make CFLAGS="${CFLAGS} -fPIC" LDFLAGS="-Bshareable" -C release/plugins
diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
new file mode 100755
index 0000000..e7b583c
--- /dev/null
+++ b/graphics/blender/CONFIGURE
@@ -0,0 +1,12 @@
+config_query_option BLENDER_PLAYER "Build blender player" n \
+ "WITH_BF_PLAYER=True" \
+ "WITH_BF_PLAYER=False" &&
+
+config_query_option BLENDER_GAMEENGINE "Build GameEngine?" y \
+ "WITH_BF_GAMEENGINE=True" \
+ "WITH_BF_GAMEENGINE=False" &&
+
+config_query_option BLENDER_OGG "Build ogg,vorbis,theora support?" n \
+ "WITH_BF_OGG=True" \
+ "WITH_BF_OGG=False"
+
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index 594022a..20efcf3 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -1,30 +1,107 @@
-depends python &&
-depends scons &&
-depends sdl &&
-depends GLUT &&
-depends zlib &&
-depends JPEG &&
-depends yasm &&
-
-optional_depends openexr \
- "WITH_BF_OPENEXR=1" \
- "WITH_BF_OPENEXR=0" \
- "for High Dynamic Range graphics (OpenEXR) support" &&
-
-optional_depends ode \
- "WITH_BF_ODE=1" \
- "WITH_BF_ODE=0" \
- "for Open Dynamics Engine (ODE) support" &&
-
-optional_depends freealut \
- "WITH_BF_OPENAL=1" \
- "WITH_BF_OPENAL=0" \
- "for blender audio ability (FreeALUT + OpenAL)" &&
-
-optional_depends LIBAVCODEC \
- "WITH_BF_FFMPEG=1" \
- "WITH_BF_FFMPEG=0" \
- "use ffmpeg as a dependency?" &&
-
-optional_depends libpng "" "" "for PNG file support" &&
-optional_depends yafray "" "" "for Yafray raytracing"
+depends gcc &&
+depends -sub CXX gcc &&
+depends python3 &&
+depends scons &&
+depends OPENGL &&
+depends glew &&
+depends libsamplerate &&
+depends libice &&
+depends libsm &&
+depends libx11 &&
+depends libxtst &&
+depends libxau &&
+depends libxcomposite &&
+depends libxcursor &&
+depends libxdamage &&
+depends libxdmcp &&
+depends libxext &&
+depends libxfixes &&
+depends libxft &&
+depends libxi &&
+depends libxv &&
+depends libxpm &&
+depends libxt &&
+depends libxscrnsaver &&
+depends libxrandr &&
+depends libxxf86misc &&
+depends libxinerama &&
+depends freetype2 &&
+depends eigen2 &&
+depends bullet "" "" games &&
+
+if [ "$BLENDER_OGG" == "WITH_BF_OGG=True" ]; then
+ depends libogg &&
+ depends libvorbis &&
+ depends libtheora
+fi &&
+
+optional_depends gettext \
+ "WITH_BF_INTERNATIONAL=True" \
+ "WITH_BF_INTERNATIONAL=False" \
+ "Enable international?" &&
+
+optional_depends JPEG \
+ "WITH_BF_JPEG=True" \
+ "WITH_BF_JPEG=False" \
+ "Enable JPEG support?" &&
+
+optional_depends libpng \
+ "WITH_BF_PNG=True" \
+ "WITH_BF_PNG=False" \
+ "Enable PNG support?" &&
+
+optional_depends tiff \
+ "WITH_BF_TIFF=True" \
+ "WITH_BF_TIFF=False" \
+ "Enable TIFF support?" &&
+
+optional_depends openjpeg \
+ "WITH_BF_OPENJPEG=True" \
+ "WITH_BF_OPENJPEG=False" \
+ "Enable openjpeg support?" &&
+
+optional_depends freealut \
+ "WITH_BF_OPENAL=True" \
+ "WITH_BF_OPENAL=False" \
+ "Enable OpenAL support?" &&
+
+optional_depends libsndfile \
+ "WITH_BF_SNDFILE=True BF_SNDFILE_INC=/usr/include" \
+ "WITH_BF_SNDFILE=False" \
+ "Enable libsndfile support?" &&
+
+optional_depends sdl \
+ "WITH_BF_SDL=True" \
+ "WITH_BF_SDL=False" \
+ "Enable SDL support?" &&
+
+optional_depends openexr \
+ "WITH_BF_OPENEXR=True" \
+ "WITH_BF_OPENEXR=False" \
+ "Enable openexr support?" &&
+
+optional_depends LIBAVCODEC \
+ "WITH_BF_FFMPEG=True" \
+ "WITH_BF_FFMPEG=False" \
+ "Enable FFMPEG support?" &&
+
+optional_depends fftw \
+ "WITH_BF_FFTW3=True" \
+ "WITH_BF_FFTW3=False" \
+ "Enable fftw support?" &&
+
+optional_depends zlib \
+ "WITH_BF_ZLIB=True" \
+ "WITH_BF_ZLIB=False" \
+ "Enable zlib support?" &&
+
+optional_depends JACK-DRIVER \
+ "WITH_BF_JACK=True" \
+ "WITH_BF_JACK=False" \
+ "Enable jack support?"
+
+#optional_depends glibc \
+# "WITH_BF_ICONV = True" \
+# "WITH_BF_ICONV = False" \
+# "Enable iconv support/"
+
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index 9c5e952..78a09b5 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -1,11 +1,24 @@
SPELL=blender
- VERSION=2.49b
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+if [ "$BLENDER_BRANCH" == "scm" ]; then
+ if [ "$BLENDER_AUTOUPDATE" == "y" ]; then
+ VERSION=$(date +%Y%m%d)
+ else
+ VERSION=svn
+ fi
+ SOURCE=$SPELL-svn.tar.bz2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
+
SOURCE_URL[0]=svn_https://svn.blender.org/svnroot/bf-blender/trunk/blender:$SPELL-svn
+ SOURCE_IGNORE=volatile
+else
+ VERSION=2.60
+ EXTRA=a
+ SOURCE=$SPELL-${VERSION}${EXTRA}.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}${EXTRA}"
SOURCE_URL[0]=http://download.blender.org/source/$SOURCE
SOURCE_URL[1]=http://mirror.cs.umn.edu/blender.org/source/$SOURCE
SOURCE_URL[2]=http://public.planetmirror.com/pub/blender/source/$SOURCE
-
SOURCE_HASH=sha512:0e83388849898a61a308584be05307697ef8d0e67c5f161eea0d11f75a29d14c26547aa7b20f356065e70db823082e11a39dc06e59d3d73ef8c87738d2f88460
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+fi
LICENSE[0]=GPL
KEYWORDS="graphics"
WEB_SITE=http://www.blender.org/
diff --git a/graphics/blender/FINAL b/graphics/blender/FINAL
index a9314da..58ee1d7 100755
--- a/graphics/blender/FINAL
+++ b/graphics/blender/FINAL
@@ -1,4 +1,4 @@
# scons leaves mess behind ...
# Ignoring result on purpose ( no && )
-rm -rf "$BUILD_DIRECTORY"/{build,lib}
+rm -rf "$BUILD_DIRECTORY"/{build,install}
true
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index dcdca02..73fe9dd 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,15 @@
+2011-11-22 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 2.60a
+ changed to use branch function variables
+ * PREPARE: changed to branch function
+ * PRE_BUILD: applied patches from gentoo
+
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/blender/files/
+ * CONFIGURE: added additional build queries
+ * DEPENDS: added new depends and optionals
+ * BUILD: changed to flow gentoo's ebuild
+ * INSTALL: changed to install new layout following gentoo's ebuild
+ * FINAL: changed to remove install instead of lib
+
2011-01-02 Ismael Luceno <ismael AT sourcemage.org>
* blender.desktop: added spanish comment

diff --git a/graphics/blender/INSTALL b/graphics/blender/INSTALL
index a239af1..80a8b25 100755
--- a/graphics/blender/INSTALL
+++ b/graphics/blender/INSTALL
@@ -1,23 +1,106 @@
-install -vm 755 install/blender{,player} "$INSTALL_ROOT/usr/bin" &&
+cat <<- EOF >> "${BUILD_DIRECTORY}/install/$SPELL-${VERSION}"
+#!/bin/sh

-install -vm 644 "$SPELL_DIRECTORY/blender48x48.png" \
- "$INSTALL_ROOT/usr/share/pixmaps" &&
+# 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

-install -vm 755 -d "$INSTALL_ROOT/usr/share/blender" &&
-install -vm 755 -d "$INSTALL_ROOT/usr/lib/blender/plugins/sequence" &&
-install -vm 755 -d "$INSTALL_ROOT/usr/lib/blender/plugins/texture" &&
+export BLENDER_SYSTEM_BASE="/usr/share/${SPELL}/${VERSION}"
+export BLENDER_SYSTEM_SCRIPTS="/usr/share/$SPELL/${VERSION}/scripts"
+export BLENDER_SYSTEM_DATAFILES="/usr/share/$SPELL/${VERSION}/datafiles"
+export BLENDER_SYSTEM_PLUGINS="/usr/lib/$SPELL/${VERSION}/plugins"
+exec /usr/bin/$SPELL-bin-${VERSION} \$*
+EOF

-install -vm 644 "$SOURCE_DIRECTORY"/install/plugins/sequence/*.so \
- "$INSTALL_ROOT/usr/lib/blender/plugins/sequence" &&
-install -vm 644 "$SOURCE_DIRECTORY"/install/plugins/texture/*.so \
- "$INSTALL_ROOT/usr/lib/blender/plugins/texture" &&
+cp $BUILD_DIRECTORY/install/$SPELL
$BUILD_DIRECTORY/install/$SPELL-bin-$VERSION &&

-cp -va "$SOURCE_DIRECTORY/release/scripts/bpydata" \
- "$INSTALL_ROOT/usr/share/blender" &&
-cp -va "$SOURCE_DIRECTORY/release/scripts" \
- "$INSTALL_ROOT/usr/share/blender" &&
+if [ "$BLENDER_PLAYER" == "WITH_BF_PLAYER=True" ]; then
+ cp $BUILD_DIRECTORY/install/${SPELL}player
$BUILD_DIRECTORY/install/${SPELL}player-bin-$VERSION
+fi &&

-install -vm 644 "$SOURCE_DIRECTORY/release/VERSION" \
- "$INSTALL_ROOT/usr/share/blender" &&
+# install binaries
+install -vm 755 -d $INSTALL_ROOT/usr/bin
&&
+install -vm 755 -D $BUILD_DIRECTORY/install/${SPELL}*${VERSION}
$INSTALL_ROOT/usr/bin &&
+#install -vm 755 $BUILD_DIRECTORY/install/blender{,player}-bin-$VERSION
$INSTALL_ROOT/usr/bin &&
+
+# install plugins
+install -vm 755 -d $INSTALL_ROOT/usr/lib/$SPELL/${VERSION}/plugins/texture
&&
+install -vm 755 -D $SOURCE_DIRECTORY/release/plugins/texture/*.so \
+ $INSTALL_ROOT/usr/lib/$SPELL/${VERSION}/plugins/texture
&&
+install -vm 755 -d $INSTALL_ROOT/usr/lib/$SPELL/$VERSION/plugins/sequences
&&
+install -vm 755 -D $SOURCE_DIRECTORY/release/plugins/sequence/*.so \
+ $INSTALL_ROOT/usr/lib/$SPELL/$VERSION/plugins/sequences
&&
+install -vm 755 -d $INSTALL_ROOT/usr/include/$SPELL/$VERSION
&&
+install -vm 644 -D $SOURCE_DIRECTORY/source/blender/blenpluginapi/*.h \
+ $INSTALL_ROOT/usr/include/$SPELL/$VERSION
&&
+
+# installing blender
+install -vm 755 -d $INSTALL_ROOT/usr/share/${SPELL}/${VERSION} &&
+#install -v -D $BUILD_DIRECTORY/install/$VERSION/* \
+# $INSTALL_ROOT/usr/share/${SPELL}/${VERSION} &&
+cp -Rvf $BUILD_DIRECTORY/install/$VERSION/* \
+ $INSTALL_ROOT/usr/share/$SPELL/$VERSION &&
+
+
+#install desktop file
+cp release/freedesktop/blender.desktop \
+ release/freedesktop/blender-${VERSION}.desktop &&
+
+install -vm 755 -d $INSTALL_ROOT/usr/share/applications
&&
+install -vm 644 -D
$SOURCE_DIRECTORY/release/freedesktop/blender-${VERSION}.desktop \
+ $INSTALL_ROOT/usr/share/applications
&&
+
+#install icons
+cp $BUILD_DIRECTORY/install/icons/16x16/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/16x16/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/22x22/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/22x22/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/24x24/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/24x24/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/32x32/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/32x32/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/48x48/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/48x48/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/256x256/apps/blender.png \
+ $BUILD_DIRECTORY/install/icons/256x256/apps/blender-$VERSION.png &&
+cp $BUILD_DIRECTORY/install/icons/scalable/apps/blender.svg \
+ $BUILD_DIRECTORY/install/icons/scalable/apps/blender-${VERSION}.svg &&
+
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/16x16/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/22x22/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/24x24/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/32x32/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/48x48/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/256x256/apps &&
+install -vm 755 -d $INSTALL_ROOT/usr/share/icons/hicolor/scalable/apps &&
+
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/16x16/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/16x16/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/22x22/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/22x22/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/24x24/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/24x24/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/32x32/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/32x32/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/48x48/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/48x48/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/256x256/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/256x256/apps &&
+install -vm 644 -D $BUILD_DIRECTORY/install/icons/scalable/apps/* \
+ $INTALL_ROOT/usr/share/icons/hicolor/scalable/apps &&
+
+ln -sfn $INSTALL_ROOT/usr/share/icons/hicolor/256x256/apps/blender-2.60.png
\
+ $INSTALL_ROOT/usr/share/pixmaps
&&
+
+# install docs
+install -vm 755 -d $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION &&
+install -vm 644 -D $BUILD_DIRECTORY/install/*.txt \
+ $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION &&
+install -vm 644 -D $BUILD_DIRECTORY/install/*.html \
+ $INSTALL_ROOT/usr/share/doc/$SPELL/$VERSION

-find "$INSTALL_ROOT/usr/share/blender/scripts" -name "*.py" -exec chmod -R
644 '{}' \;
diff --git a/graphics/blender/PREPARE b/graphics/blender/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/graphics/blender/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index 91d1ce0..61ea862 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,12 +1,48 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&

-chmod 755 release/plugins/bmake &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.60a-desktop.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.60-doxyfile.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.60-bmake.patch &&
+chmod 755 release/plugins/bmake &&
+rm -r extern/libopenjpeg &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.60-openjpeg.patch &&
+rm -r extern/glew &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.60-glew.patch &&
+rm -r extern/Eigen2 &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.60-eigen.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.60a-libav-0.7.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.60a-CVE-2009-3850-v3.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.60a-enable_site_module.patch

-# set Python version to the installed version, not hardcoded one
-sed -i "s:2.5:$(installed_version python | cut -d . -f
1,2):;s:-Wdeclaration-after-statement::" \
- "$SOURCE_DIRECTORY/config/linux2-config.py" &&
+#patch < $SCRIPT_DIRECTORY/blender-2.60a-linux-3.patch

-patch -p1 < "$SPELL_DIRECTORY/blender-2.44-scriptsdir.patch" &&
+cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
+REL_CFLAGS=[]
+REL_CXXFLAGS=[]
+REL_CCFLAGS=[]
+EOF

-sed -i 's@../../src/@\\$(<D)/../../@' extern/xvidcore/build/generic/configure
+cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
+C_WARN =[ '-w', '-g0' ]
+CC_WARN =[ '-w', '-g0' ]
+CXX_WARN=[ '-w', '-g0' ]
+EOF
+
+cat <<- EOF >> "${SOURCE_DIRECTORY}"/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="m"
+BF_BUILDINFO=0
+BF_QUIET=1
+BF_NUMJOBS=${MAKE_NJOBS}
+BF_LINE_OVERWRITE=0
+WITH_BF_FHS=1
+WITH_BF_STATICOPENGL=0
+EOF
+# WITH_BF_BINRELOC=0
+# WITH_BF_OPENMP=${enable_openmp}
diff --git a/graphics/blender/blender-2.44-scriptsdir.patch
b/graphics/blender/blender-2.44-scriptsdir.patch
deleted file mode 100644
index 398ccc5..0000000
--- a/graphics/blender/blender-2.44-scriptsdir.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- blender-2.44/source/blender/python/api2_2x/EXPP_interface.c.orig
2006-05-01 14:24:56.000000000 +0200
-+++ blender-2.44/source/blender/python/api2_2x/EXPP_interface.c
2007-06-21 22:25:39.000000000 +0200
-@@ -52,85 +52,13 @@
- */
- char *bpy_gethome(int append_scriptsdir)
- {
-- static char homedir[FILE_MAXDIR];
-- static char scriptsdir[FILE_MAXDIR];
-- char tmpdir[FILE_MAXDIR];
-- char bprogdir[FILE_MAXDIR];
-- char *s;
-- int i;
-+ static char homedir[FILE_MAXDIR]="/usr/share/blender";
-+ static char scriptsdir[FILE_MAXDIR]="/usr/share/blender/scripts";
-
- if (append_scriptsdir) {
-- if (scriptsdir[0] != '\0')
- return scriptsdir;
- }
-- else if (homedir[0] != '\0')
-- return homedir;
--
-- /* BLI_gethome() can return NULL if env vars are not set */
-- s = BLI_gethome();
--
-- if( !s ) /* bail if no $HOME */
-- {
-- printf("$HOME is NOT set\n");
-- return NULL;
-- }
--
-- if( strstr( s, ".blender" ) )
-- PyOS_snprintf( homedir, FILE_MAXDIR, s );
-- else
-- BLI_make_file_string( "/", homedir, s, ".blender" );
--
-- /* if userhome/.blender/ exists, return it */
-- if( BLI_exists( homedir ) ) {
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, homedir,
"scripts");
-- if (BLI_exists (scriptsdir)) return scriptsdir;
-- }
-- else return homedir;
-- }
-- else homedir[0] = '\0';
--
-- /* if either:
-- * no homedir was found or
-- * append_scriptsdir = 1 but there's no scripts/ inside homedir,
-- * use argv[0] (bprogname) to get .blender/ in
-- * Blender's installation dir */
-- s = BLI_last_slash( bprogname );
--
-- i = s - bprogname + 1;
--
-- PyOS_snprintf( bprogdir, i, "%s", bprogname );
--
-- /* using tmpdir to preserve homedir (if) found above:
-- * the ideal is to have a home dir with scripts dir inside
-- * it, but if that isn't available, it's possible to
-- * have a 'broken' home dir somewhere and a scripts dir in the
-- * cvs sources */
-- BLI_make_file_string( "/", tmpdir, bprogdir, ".blender" );
--
-- if (BLI_exists(tmpdir)) {
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, tmpdir,
"scripts");
-- if (BLI_exists(scriptsdir)) {
-- PyOS_snprintf(homedir, FILE_MAXDIR, "%s",
tmpdir);
-- return scriptsdir;
-- }
-- else {
-- homedir[0] = '\0';
-- scriptsdir[0] = '\0';
-- }
-- }
-- else return homedir;
-- }
--
-- /* last try for scripts dir: blender in cvs dir, scripts/ inside
release/: */
-- if (append_scriptsdir) {
-- BLI_make_file_string("/", scriptsdir, bprogdir,
"release/scripts");
-- if (BLI_exists(scriptsdir)) return scriptsdir;
-- else scriptsdir[0] = '\0';
-- }
--
-- return NULL;
-+ return homedir;
- }
-
- /* PyDrivers */
diff --git a/graphics/blender/blender-2.60-bmake.patch
b/graphics/blender/blender-2.60-bmake.patch
new file mode 100644
index 0000000..0ce8fa7
--- /dev/null
+++ b/graphics/blender/blender-2.60-bmake.patch
@@ -0,0 +1,114 @@
+diff -Npur release/plugins.orig/bmake release/plugins/bmake
+--- release/plugins.orig/bmake 2011-11-11 15:00:26.339924887 +0100
++++ release/plugins/bmake 2011-11-11 15:01:40.637923565 +0100
+@@ -57,10 +57,10 @@
+ LDFLAGS="-Bshareable";
+ elif ( test $UNAME = "Linux" ) then
+ CC="gcc";
+- CFLAGS="-fPIC -funsigned-char -O2";
++# CFLAGS="-fPIC -funsigned-char -O2";
+
+ LD="ld";
+- LDFLAGS="-Bshareable";
++# LDFLAGS="-Bshareable";
+ elif ( test $UNAME = "SunOS" ) then
+ CC="cc";
+ CFLAGS="-O";
+@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then
+ INCLUDES=-I..;
+ elif ( test -f "../include/plugin.h" ) then
+ INCLUDES=-I../include
++elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
++ INCLUDES=-I../../../source/blender/blenpluginapi
+ else
+ echo "Couldn't find plugin.h";
+ exit;
+ fi
+
+ LIBM=`fgrep "#include <math.h>" $CFILE`
+-LIBC=`fgrep "#include <std" $CFILE`
+
+-LIBS=
++LIBS="-lc"
+
+ if ( test -n "$LIBM" ) then
+ LIBS="$LIBS -lm";
+ fi
+-if ( test -n "$LIBC" ) then
+- LIBS="$LIBS -lc";
+-fi
+
+ echo "$CC $CFLAGS -c $CFILE $INCLUDES"
+ $CC $CFLAGS -c $CFILE $INCLUDES
+diff -Npur release/plugins.orig/sequence/color-correction-hsv.c
release/plugins/sequence/color-correction-hsv.c
+--- release/plugins.orig/sequence/color-correction-hsv.c 2011-11-11
15:00:26.339924887 +0100
++++ release/plugins/sequence/color-correction-hsv.c 2011-11-11
15:03:47.233921332 +0100
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+
+diff -Npur release/plugins.orig/sequence/color-correction-yuv.c
release/plugins/sequence/color-correction-yuv.c
+--- release/plugins.orig/sequence/color-correction-yuv.c 2011-11-11
15:00:26.339924887 +0100
++++ release/plugins/sequence/color-correction-yuv.c 2011-11-11
15:02:10.446923031 +0100
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+
+diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c
+--- release/plugins.orig/sequence/dnr.c 2011-11-11 15:00:26.339924887
+0100
++++ release/plugins/sequence/dnr.c 2011-11-11 15:03:30.049921648 +0100
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include <stdio.h>
+
+diff -Npur release/plugins.orig/sequence/gamma.c
release/plugins/sequence/gamma.c
+--- release/plugins.orig/sequence/gamma.c 2011-11-11 15:00:26.339924887
+0100
++++ release/plugins/sequence/gamma.c 2011-11-11 15:01:58.982923268 +0100
+@@ -15,7 +15,7 @@
+ *
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+ #include "util.h"
+ #include <stdio.h>
+diff -Npur release/plugins.orig/texture/clouds2.c
release/plugins/texture/clouds2.c
+--- release/plugins.orig/texture/clouds2.c 2011-11-11 15:00:26.339924887
+0100
++++ release/plugins/texture/clouds2.c 2011-11-11 15:02:23.104922789 +0100
+@@ -27,7 +27,7 @@
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+
+ /* ******************** GLOBAL VARIABLES ***************** */
+diff -Npur release/plugins.orig/texture/tiles.c
release/plugins/texture/tiles.c
+--- release/plugins.orig/texture/tiles.c 2011-11-11 15:00:26.339924887
+0100
++++ release/plugins/texture/tiles.c 2011-11-11 15:04:05.749921038 +0100
+@@ -27,7 +27,7 @@
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+-#include "math.h"
++#include <math.h>
+ #include "plugin.h"
+
+ /* ******************** GLOBAL VARIABLES ***************** */
diff --git a/graphics/blender/blender-2.60-doxyfile.patch
b/graphics/blender/blender-2.60-doxyfile.patch
new file mode 100644
index 0000000..aa61c55
--- /dev/null
+++ b/graphics/blender/blender-2.60-doxyfile.patch
@@ -0,0 +1,11 @@
+--- blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:27:33.975642545 -0300
++++ blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:28:54.913642574 -0300
+@@ -42,7 +42,7 @@
+ # exceed 55 pixels and the maximum width should not exceed 200 pixels.
+ # Doxygen will copy the logo to the output directory.
+
+-PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png
++PROJECT_LOGO =
../../release/freedesktop/icons/48x48/apps/blender.png
+
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+ # base path where the generated documentation will be put.
diff --git a/graphics/blender/blender-2.60-eigen.patch
b/graphics/blender/blender-2.60-eigen.patch
new file mode 100644
index 0000000..6955ee1
--- /dev/null
+++ b/graphics/blender/blender-2.60-eigen.patch
@@ -0,0 +1,293 @@
+--- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200
++++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200
+@@ -5,7 +5,8 @@
+ sources += env.Glob('kdl/*.cpp')
+ sources += env.Glob('kdl/utilities/*.cpp')
+
+-incs = '. ../../extern/Eigen2'
++#incs = '. ../../extern/Eigen2'
++incs = '. /usr/include/eigen2'
+
+ env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [],
libtype=['intern','player'], priority=[20,100] )
+
+--- source/blender/ikplugin/SConscript
++++ source/blender/ikplugin/SConscript
+@@ -4,6 +4,6 @@
+ sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp')
+
+ incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna
../blenlib'
+-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc
#/extern/Eigen2'
++incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc
/usr/include/eigen2'
+
+ env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [],
libtype=['core','player'], priority=[180, 190] )
+--- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000
+0200
++++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000
+0200
+@@ -21,7 +21,8 @@
+ incs += ' #source/blender/makesrna'
+ incs += ' #source/blender/ikplugin'
+ incs += ' #extern/recastnavigation/Detour/Include'
+-incs += ' #extern/Eigen2'
++#incs += ' #extern/Eigen2'
++incs += ' /usr/include/eigen2'
+
+ incs += ' ' + env['BF_BULLET_INC']
+
+--- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100
++++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100
+@@ -25,11 +25,11 @@
+ # ***** END GPL LICENSE BLOCK *****
+
+ set(INC
+- ../../extern/Eigen2
++ /usr/include/eigen2
+ )
+
+ set(INC_SYS
+-
++ /usr/include/eigen2
+ )
+
+ set(SRC
+@@ -117,113 +117,113 @@ set(SRC
+ ublas_types.hpp
+
+ # until we have another user...
+- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h
+- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h
+- ../../extern/Eigen2/Eigen/src/Array/Functors.h
+- ../../extern/Eigen2/Eigen/src/Array/Norms.h
+- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h
+- ../../extern/Eigen2/Eigen/src/Array/Random.h
+- ../../extern/Eigen2/Eigen/src/Array/Select.h
+- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h
+- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h
+- ../../extern/Eigen2/Eigen/src/Core/Assign.h
+- ../../extern/Eigen2/Eigen/src/Core/Block.h
+- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
+- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h
+- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h
+- ../../extern/Eigen2/Eigen/src/Core/Cwise.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
+- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
+- ../../extern/Eigen2/Eigen/src/Core/Dot.h
+- ../../extern/Eigen2/Eigen/src/Core/Flagged.h
+- ../../extern/Eigen2/Eigen/src/Core/Functors.h
+- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h
+- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/IO.h
+- ../../extern/Eigen2/Eigen/src/Core/Map.h
+- ../../extern/Eigen2/Eigen/src/Core/MapBase.h
+- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h
+- ../../extern/Eigen2/Eigen/src/Core/Matrix.h
+- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h
+- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h
+- ../../extern/Eigen2/Eigen/src/Core/Minor.h
+- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h
+- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h
+- ../../extern/Eigen2/Eigen/src/Core/Part.h
+- ../../extern/Eigen2/Eigen/src/Core/Product.h
+- ../../extern/Eigen2/Eigen/src/Core/Redux.h
+- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h
+- ../../extern/Eigen2/Eigen/src/Core/Sum.h
+- ../../extern/Eigen2/Eigen/src/Core/Swap.h
+- ../../extern/Eigen2/Eigen/src/Core/Transpose.h
+- ../../extern/Eigen2/Eigen/src/Core/Visitor.h
+- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h
+- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
+- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
+- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h
+- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h
+- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
+- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h
+- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
+- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
+- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
+- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
+- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
+- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h
+- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h
+- ../../extern/Eigen2/Eigen/src/LU/Determinant.h
+- ../../extern/Eigen2/Eigen/src/LU/Inverse.h
+- ../../extern/Eigen2/Eigen/src/LU/LU.h
+- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
+- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h
+- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
+- ../../extern/Eigen2/Eigen/src/QR/QR.h
+- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
+- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
+- ../../extern/Eigen2/Eigen/src/SVD/SVD.h
+- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
+- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
+- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h
+- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
+- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
+- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
++ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h
++ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h
++ /usr/include/eigen2/Eigen/src/Array/Functors.h
++ /usr/include/eigen2/Eigen/src/Array/Norms.h
++ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h
++ /usr/include/eigen2/Eigen/src/Array/Random.h
++ /usr/include/eigen2/Eigen/src/Array/Select.h
++ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h
++ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h
++ /usr/include/eigen2/Eigen/src/Core/Assign.h
++ /usr/include/eigen2/Eigen/src/Core/Block.h
++ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
++ /usr/include/eigen2/Eigen/src/Core/Coeffs.h
++ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h
++ /usr/include/eigen2/Eigen/src/Core/Cwise.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h
++ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h
++ /usr/include/eigen2/Eigen/src/Core/Dot.h
++ /usr/include/eigen2/Eigen/src/Core/Flagged.h
++ /usr/include/eigen2/Eigen/src/Core/Functors.h
++ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h
++ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/IO.h
++ /usr/include/eigen2/Eigen/src/Core/Map.h
++ /usr/include/eigen2/Eigen/src/Core/MapBase.h
++ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h
++ /usr/include/eigen2/Eigen/src/Core/Matrix.h
++ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h
++ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h
++ /usr/include/eigen2/Eigen/src/Core/Minor.h
++ /usr/include/eigen2/Eigen/src/Core/NestByValue.h
++ /usr/include/eigen2/Eigen/src/Core/NumTraits.h
++ /usr/include/eigen2/Eigen/src/Core/Part.h
++ /usr/include/eigen2/Eigen/src/Core/Product.h
++ /usr/include/eigen2/Eigen/src/Core/Redux.h
++ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h
++ /usr/include/eigen2/Eigen/src/Core/Sum.h
++ /usr/include/eigen2/Eigen/src/Core/Swap.h
++ /usr/include/eigen2/Eigen/src/Core/Transpose.h
++ /usr/include/eigen2/Eigen/src/Core/Visitor.h
++ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
++ /usr/include/eigen2/Eigen/src/Core/util/Constants.h
++ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
++ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
++ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h
++ /usr/include/eigen2/Eigen/src/Core/util/Macros.h
++ /usr/include/eigen2/Eigen/src/Core/util/Memory.h
++ /usr/include/eigen2/Eigen/src/Core/util/Meta.h
++ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h
++ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h
++ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h
++ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h
++ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h
++ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h
++ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h
++ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
++ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h
++ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h
++ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h
++ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h
++ /usr/include/eigen2/Eigen/src/Geometry/Transform.h
++ /usr/include/eigen2/Eigen/src/Geometry/Translation.h
++ /usr/include/eigen2/Eigen/src/LU/Determinant.h
++ /usr/include/eigen2/Eigen/src/LU/Inverse.h
++ /usr/include/eigen2/Eigen/src/LU/LU.h
++ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
++ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h
++ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
++ /usr/include/eigen2/Eigen/src/QR/QR.h
++ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
++ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h
++ /usr/include/eigen2/Eigen/src/SVD/SVD.h
++ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h
++ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h
++ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h
++ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h
++ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h
++ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h
++ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h
++ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+ )
+
+ blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}")
+--- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001
+0100
++++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231
+0100
+@@ -50,7 +50,7 @@
+ if(WITH_IK_ITASC)
+ add_definitions(-DWITH_IK_ITASC)
+ list(APPEND INC
+- ../../../extern/Eigen2
++ /usr/include/eigen2
+ ../../../intern/itasc
+ )
+ list(APPEND SRC
+--- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001
+0100
++++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231
+0100
+@@ -51,7 +51,7 @@
+ ../../blender/makesrna
+ ../../blender/windowmanager
+ ../../../extern/bullet2/src
+- ../../../extern/Eigen2
++ /usr/include/eigen2
+ ../../../intern/container
+ ../../../intern/guardedalloc
+ ../../../intern/moto/include
diff --git a/graphics/blender/blender-2.60-glew.patch
b/graphics/blender/blender-2.60-glew.patch
new file mode 100644
index 0000000..edc0c9b
--- /dev/null
+++ b/graphics/blender/blender-2.60-glew.patch
@@ -0,0 +1,48 @@
+--- extern/SConscript
++++ extern/SConscript
+@@ -2,8 +2,6 @@
+
+ Import('env')
+
+-SConscript(['glew/SConscript'])
+-
+ if env['WITH_BF_GAMEENGINE']:
+ SConscript(['recastnavigation/SConscript'])
+
+ if env['WITH_BF_ELTOPO']:
+ SConscript(['eltopo/SConscript'])
+
+--- source/blender/editors/include/BIF_gl.h
++++ source/blender/editors/include/BIF_gl.h
+@@ -35,7 +35,7 @@
+ #ifndef BIF_GL_H
+ #define BIF_GL_H
+
+-#include "GL/glew.h"
++#include <GL/glew.h>
+
+ /*
+ * these should be phased out. cpack should be replaced in
+--- extern/CMakeLists.txt
++++ extern/CMakeLists.txt
+@@ -39,9 +39,6 @@
+ add_subdirectory(binreloc)
+ endif()
+
+-if(WITH_BUILTIN_GLEW)
+- add_subdirectory(glew)
+-endif()
+
+ if(WITH_GAMEENGINE)
+ add_subdirectory(recastnavigation)
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -150,7 +150,7 @@
+
+ if(UNIX AND NOT APPLE)
+ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" 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)
+ else()
+ # not an option for other OS's
+ set(WITH_BUILTIN_GLEW ON)
diff --git a/graphics/blender/blender-2.60-openjpeg.patch
b/graphics/blender/blender-2.60-openjpeg.patch
new file mode 100644
index 0000000..74f6441
--- /dev/null
+++ b/graphics/blender/blender-2.60-openjpeg.patch
@@ -0,0 +1,37 @@
+diff -Npur blender-2.60a.orig/extern/libredcode/SConscript
blender-2.60a/extern/libredcode/SConscript
+--- blender-2.60a.orig/extern/libredcode/SConscript 2011-11-09
23:05:16.241465491 +0100
++++ blender-2.60a/extern/libredcode/SConscript 2011-11-09 23:06:24.188464236
+0100
+@@ -7,7 +7,8 @@
+ Import('env')
+
+ sources = env.Glob('*.c')
+-incs = '. ../libopenjpeg'
++#incs = '. ../libopenjpeg'
++incs = '. /usr/include'
+
+ env.BlenderLib ( libname='extern_redcode',
+ sources=sources, includes=Split(incs),
+diff -Npur blender-2.60a.orig/extern/SConscript
blender-2.60a/extern/SConscript
+--- blender-2.60a.orig/extern/SConscript 2011-11-09 23:05:16.241465491
+0100
++++ blender-2.60a/extern/SConscript 2011-11-09 23:06:24.188464236 +0100
+@@ -11,8 +11,5 @@
+ if env['WITH_BF_BULLET']:
+ SConscript(['bullet2/src/SConscript'])
+
+-if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '':
+- SConscript(['libopenjpeg/SConscript'])
+-
+ if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '':
+ SConscript(['libredcode/SConscript'])
+diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py
blender-2.60a/build_files/scons/tools/Blender.py
+--- blender-2.60a.orig/build_files/scons/tools/Blender.py 2011-11-09
23:05:16.241465491 +0100
++++ blender-2.60a/build_files/scons/tools/Blender.py 2011-11-09
23:06:24.188464236 +0100
+@@ -246,6 +246,8 @@
+ syslibs += Split(lenv['BF_FFMPEG_LIB'])
+ if lenv['WITH_BF_OGG']:
+ syslibs += Split(lenv['BF_OGG_LIB'])
++ if lenv['WITH_BF_OPENJPEG']:
++ syslibs += Split(lenv['BF_OPENJPEG_LIB'])
+ if lenv['WITH_BF_JACK']:
+ syslibs += Split(lenv['BF_JACK_LIB'])
+ if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']:
diff --git a/graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch
b/graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch
new file mode 100644
index 0000000..fc0278d
--- /dev/null
+++ b/graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch
@@ -0,0 +1,149 @@
+diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c
blender-2.60a/source/blender/blenkernel/intern/blender.c
+--- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c
2011-11-09 20:56:11.905602401 +0100
++++ blender-2.60a/source/blender/blenkernel/intern/blender.c 2011-11-09
20:56:42.827601857 +0100
+@@ -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.60a.orig/source/blender/makesrna/intern/rna_userdef.c
blender-2.60a/source/blender/makesrna/intern/rna_userdef.c
+--- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c
2011-11-09 20:56:12.003602399 +0100
++++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c 2011-11-09
21:02:43.204595484 +0100
+@@ -116,9 +116,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)
+@@ -2630,6 +2638,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.60a.orig/source/blender/windowmanager/intern/wm_files.c
blender-2.60a/source/blender/windowmanager/intern/wm_files.c
+--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c
2011-11-09 20:56:12.458602413 +0100
++++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c
2011-11-09 21:05:16.768592770 +0100
+@@ -285,12 +285,17 @@ 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_where_is_temp(btempdir, FILE_MAX, 1);
++
++ /* 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.60a.orig/source/blender/windowmanager/intern/wm_operators.c
blender-2.60a/source/blender/windowmanager/intern/wm_operators.c
+--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c
2011-11-09 20:56:12.458602413 +0100
++++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c
2011-11-09 21:07:09.746590772 +0100
+@@ -1583,12 +1583,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);
+@@ -1600,6 +1601,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";
+@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat
+ WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE,
FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH);
+
+ 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", "Allow
blend file execute scripts automatically, default available from system
preferences");
++ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts",
++ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source",
++ "Allow blend file 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.60a.orig/source/creator/creator.c
blender-2.60a/source/creator/creator.c
+--- blender-2.60a.orig/source/creator/creator.c 2011-11-09
20:56:11.899602401 +0100
++++ blender-2.60a/source/creator/creator.c 2011-11-09 21:17:22.278579932
+0100
+@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc),
+
+ printf("\n");
+
++ BLI_argsPrintArgDoc(ba, "-666");
+ BLI_argsPrintArgDoc(ba, "--enable-autoexec");
+ BLI_argsPrintArgDoc(ba, "--disable-autoexec");
+
+@@ -326,14 +327,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;
+ }
+
+@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C,
+ # define PY_DISABLE_AUTO ", (compiled as non-standard default)"
+ #endif
+
+- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic
python script execution" PY_ENABLE_AUTO, enable_python, NULL);
+- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic
python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO,
disable_python, NULL);
++ BLI_argsAdd(ba, 1, NULL, "-666", "\n\tEnable automatic python script
execution (port from CVE-2009-3850 patch to Blender 2.60a)" PY_ENABLE_AUTO,
enable_python, NULL);
++ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic
python script execution" PY_ENABLE_AUTO, enable_python, NULL);
++ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic
python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO,
disable_python, NULL);
+
+ #undef PY_ENABLE_AUTO
+ #undef PY_DISABLE_AUTO
diff --git a/graphics/blender/blender-2.60a-desktop.patch
b/graphics/blender/blender-2.60a-desktop.patch
new file mode 100644
index 0000000..c774cbe
--- /dev/null
+++ b/graphics/blender/blender-2.60a-desktop.patch
@@ -0,0 +1,20 @@
+--- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700
++++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Name=Blender
++Name=Blender-2.60a
+ GenericName=3D modeller
+ GenericName[es]=modelador 3D
+ GenericName[de]=3D Modellierer
+@@ -7,8 +7,8 @@
+ GenericName[ru]=Редактор 3D-моделей
+ Comment=3D modeling, animation, rendering and post-production
+ Comment[es]=modelado 3D, animación, renderizado y post-producción
+-Exec=blender
+-Icon=blender
++Exec=blender-2.60
++Icon=blender-2.60
+ Terminal=false
+ Type=Application
+ Categories=Graphics;3DGraphics;
diff --git a/graphics/blender/blender-2.60a-enable_site_module.patch
b/graphics/blender/blender-2.60a-enable_site_module.patch
new file mode 100644
index 0000000..8a44c36
--- /dev/null
+++ b/graphics/blender/blender-2.60a-enable_site_module.patch
@@ -0,0 +1,32 @@
+--- source/blender/python/intern/bpy_interface.c
++++ source/blender/python/intern/bpy_interface.c
+@@ -203,11 +203,6 @@
+ /* allow to use our own included python */
+ PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL));
+
+- /* Python 3.2 now looks for
'2.58/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
+--- source/gameengine/Ketsji/KX_PythonInit.cpp
++++ source/gameengine/Ketsji/KX_PythonInit.cpp
+@@ -1825,7 +1825,6 @@
+ STR_String pname = progname;
+ Py_SetProgramName(pname.Ptr());
+ #endif
+- Py_NoSiteFlag=1;
+ Py_FrozenFlag=1;
+
+ /* must run before python initializes */
+@@ -1898,7 +1897,6 @@
+ STR_String pname = progname;
+ Py_SetProgramName(pname.Ptr());
+ #endif
+- Py_NoSiteFlag=1;
+ Py_FrozenFlag=1;
+
+ initPyTypes();
diff --git a/graphics/blender/blender-2.60a-libav-0.7.patch
b/graphics/blender/blender-2.60a-libav-0.7.patch
new file mode 100644
index 0000000..3bae020
--- /dev/null
+++ b/graphics/blender/blender-2.60a-libav-0.7.patch
@@ -0,0 +1,30 @@
+--- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
2011-10-24 20:09:01.000000000 +0200
++++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13
12:34:01.000000000 +0100
+@@ -40,6 +40,8 @@
+ #include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavformat/avio.h>
++#include <libavutil/mathematics.h>
++#include <libavutil/avstring.h>
+ #include "ffmpeg_compat.h"
+ }
+
+@@ -57,10 +58,15 @@
+ {
+ static const char* formats[] = { NULL, "ac3", "flac", "matroska",
"mp2", "mp3", "ogg", "wav" };
+
+- if(avformat_alloc_output_context2(&m_formatCtx, NULL,
formats[format], filename.c_str()))
+- AUD_THROW(AUD_ERROR_FFMPEG, context_error);
++ m_formatCtx = avformat_alloc_context();
++ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error);
+
+- m_outputFmt = m_formatCtx->oformat;
++ av_strlcpy(m_formatCtx->filename, filename.c_str(),
sizeof(m_formatCtx->filename));
++ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format],
filename.c_str(), NULL);
++ if (!m_outputFmt) {
++ avformat_free_context(m_formatCtx);
++ AUD_THROW(AUD_ERROR_FFMPEG, context_error);
++ }
+
+ switch(codec)
+ {
diff --git a/graphics/blender/blender-2.60a-linux-3.patch
b/graphics/blender/blender-2.60a-linux-3.patch
new file mode 100644
index 0000000..6a96b49
--- /dev/null
+++ b/graphics/blender/blender-2.60a-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")
diff --git a/graphics/blender/blender-2.60a.tar.gz.sig
b/graphics/blender/blender-2.60a.tar.gz.sig
new file mode 100644
index 0000000..6065171
Binary files /dev/null and b/graphics/blender/blender-2.60a.tar.gz.sig differ
diff --git a/graphics/blender/blender48x48.png
b/graphics/blender/blender48x48.png
deleted file mode 100644
index 1eec612..0000000
Binary files a/graphics/blender/blender48x48.png and /dev/null differ
diff --git a/graphics/blender/desktop/blender.desktop
b/graphics/blender/desktop/blender.desktop
deleted file mode 100644
index cd543d8..0000000
--- a/graphics/blender/desktop/blender.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Blender
-Name[en_CA]=Blender
-Name[fr]=Blender
-Comment=3D modeling, animation and rendering
-Comment[en_CA]=3D modeling, animation and rendering
-Comment[es]=Modelado, animación y representación 3D
-Comment[fr]=Modélisation, animation et rendu 3D
-Exec=blender
-Icon=blender48x48.png
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Application;Graphics;



  • [SM-Commit] GIT changes to master grimoire by Robin Cook (b1dba55eb716334b9633353bd2cb1f915588e6a2), Robin Cook, 11/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page