Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (09f30d0a6c131fb383567af38bf12f9d1a231431)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (09f30d0a6c131fb383567af38bf12f9d1a231431)
  • Date: Fri, 16 Dec 2011 06:47:11 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

audio-drivers/pulseaudio/DEPENDS | 2
audio-drivers/pulseaudio/DETAILS | 2
audio-drivers/pulseaudio/HISTORY | 5
audio-drivers/pulseaudio/UP_TRIGGERS | 9
audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig | 0
audio-drivers/pulseaudio/pulseaudio-1.1.tar.gz.sig |binary
audio-soft/paprefs/DETAILS | 2
audio-soft/paprefs/HISTORY | 3
audio-soft/paprefs/paprefs-0.9.10.tar.gz.sig |binary
audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig | 0
audio-soft/pavucontrol/DETAILS | 6
audio-soft/pavucontrol/HISTORY | 3
audio-soft/pavucontrol/pavucontrol-0.9.10.tar.gz.sig | 0
audio-soft/pavucontrol/pavucontrol-1.0.tar.gz.sig |binary
crypto/ca-certificates/DETAILS | 4
crypto/ca-certificates/HISTORY | 4
dev/null |binary
graphics/blender/BUILD | 13
graphics/blender/CONFIGURE | 4
graphics/blender/DEPENDS | 10
graphics/blender/DETAILS | 7
graphics/blender/HISTORY | 8
graphics/blender/PRE_BUILD | 15
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.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-linux-3.patch | 12
graphics/blender/blender-2.60a.tar.gz.sig | 0
graphics/blender/blender-2.61-CVE-2009-3850.patch | 152 ++++
graphics/blender/blender-2.61-desktop.patch | 20
graphics/blender/blender-2.61-eigen.patch | 521
++++++++++++++++
graphics/blender/blender-2.61-enable_site_module.patch | 34 +
graphics/blender/blender-2.61-glew.patch | 49 +
graphics/blender/blender-2.61.tar.gz.sig |binary
x11-toolkits/qt4/CONFIGURE | 2
x11-toolkits/qt4/DETAILS | 4
x11-toolkits/qt4/HISTORY | 4
40 files changed, 854 insertions(+), 594 deletions(-)

New commits:
commit 8a18d8e6aa26c06df1e54cc71c3c0d97c665d200
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ca-certificates: => 20111211

commit 0ad372670c0dfa5fa07a2539a0d0f78803efa62c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

qt4 4.8.0

-qt-gif: invalid command-line switch

commit b2ac404bc24de0e185e0ffc64240defb95daa741
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

blender: updated to 2.61

commit 684f0b6b9cb8e92621957159c54771d43b76d05e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

pulseaudio: UP_TRIGGERS added

commit 088c4f4f7cd12772a4045b63b68553516d417275
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

paprefs 0.9.10

commit 98dad2cf0d25b1f35d0472993adba0b960cd72e2
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

pavucontrol 1.0

commit fc6931b96e6b39d21fcce8121ad35de531f30922
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

pulseaudio 1.1

diff --git a/audio-drivers/pulseaudio/DEPENDS
b/audio-drivers/pulseaudio/DEPENDS
index 4abbddc..0a5caba 100755
--- a/audio-drivers/pulseaudio/DEPENDS
+++ b/audio-drivers/pulseaudio/DEPENDS
@@ -11,6 +11,8 @@ else
message "using configuration database $PULSE_DB"
fi &&

+depends json-c &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
diff --git a/audio-drivers/pulseaudio/DETAILS
b/audio-drivers/pulseaudio/DETAILS
index 9242fe5..c404dad 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,5 +1,5 @@
SPELL=pulseaudio
- VERSION=0.9.23
+ VERSION=1.1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
SOURCE_URL=http://freedesktop.org/software/$SPELL/releases/$SOURCE
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index 313aa4c..6b2ef7e 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,8 @@
+2011-12-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1
+ * DEPENDS: json-c added
+ * UP_TRIGGERS: added
+
2011-09-19 Arjan Bouter <abouter AT sourcemage.org>
* CONFIGURE: corrected oss options and added ipv6 switches
* DEPENDS: disabled polkit, no longer supported by configure.
diff --git a/audio-drivers/pulseaudio/UP_TRIGGERS
b/audio-drivers/pulseaudio/UP_TRIGGERS
new file mode 100755
index 0000000..862bcb1
--- /dev/null
+++ b/audio-drivers/pulseaudio/UP_TRIGGERS
@@ -0,0 +1,9 @@
+local OLD_SPELL_VERSION=""
+spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)"
+if [ "${VERSION:0:1}" != "${OLD_SPELL_VERSION:0:1}" ]; then
+ message "This is an incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each cast_self
+ done
+fi
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig
deleted file mode 100644
index 791b4ab..0000000
Binary files a/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig and
/dev/null differ
diff --git a/audio-drivers/pulseaudio/pulseaudio-1.1.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-1.1.tar.gz.sig
new file mode 100644
index 0000000..b486a53
Binary files /dev/null and
b/audio-drivers/pulseaudio/pulseaudio-1.1.tar.gz.sig differ
diff --git a/audio-soft/paprefs/DETAILS b/audio-soft/paprefs/DETAILS
index baaf395..2b715d3 100755
--- a/audio-soft/paprefs/DETAILS
+++ b/audio-soft/paprefs/DETAILS
@@ -1,5 +1,5 @@
SPELL=paprefs
- VERSION=0.9.9
+ VERSION=0.9.10
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://0pointer.de/lennart/projects/paprefs/$SOURCE
diff --git a/audio-soft/paprefs/HISTORY b/audio-soft/paprefs/HISTORY
index d4a32ff..06651fb 100644
--- a/audio-soft/paprefs/HISTORY
+++ b/audio-soft/paprefs/HISTORY
@@ -1,3 +1,6 @@
+2011-12-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.10
+
2009-09-10 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Now depends on pulseaudio during compilation

diff --git a/audio-soft/paprefs/paprefs-0.9.10.tar.gz.sig
b/audio-soft/paprefs/paprefs-0.9.10.tar.gz.sig
new file mode 100644
index 0000000..4a206a6
Binary files /dev/null and b/audio-soft/paprefs/paprefs-0.9.10.tar.gz.sig
differ
diff --git a/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
b/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig
deleted file mode 100644
index 65f0d88..0000000
Binary files a/audio-soft/paprefs/paprefs-0.9.9.tar.gz.sig and /dev/null
differ
diff --git a/audio-soft/pavucontrol/DETAILS b/audio-soft/pavucontrol/DETAILS
index 25816fc..aa20776 100755
--- a/audio-soft/pavucontrol/DETAILS
+++ b/audio-soft/pavucontrol/DETAILS
@@ -1,9 +1,9 @@
SPELL=pavucontrol
- VERSION=0.9.10
+ VERSION=1.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://0pointer.de/lennart/projects/pavucontrol/$SOURCE
- WEB_SITE=http://0pointer.de/lennart/projects/pavucontrol/
+
SOURCE_URL[0]=http://freedesktop.org/software/pulseaudio/pavucontrol/$SOURCE
+ WEB_SITE=http://freedesktop.org/software/pulseaudio/pavucontrol/
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
LICENSE[0]=GPL
ENTERED=20071016
diff --git a/audio-soft/pavucontrol/HISTORY b/audio-soft/pavucontrol/HISTORY
index 273afd6..6efbbfe 100644
--- a/audio-soft/pavucontrol/HISTORY
+++ b/audio-soft/pavucontrol/HISTORY
@@ -1,3 +1,6 @@
+2011-12-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0, WEB_SITE and SOURCE_URL[0] updated
+
2009-10-24 Bearcat M. Sandor <sourcemage AT feline-soul.com>
* DETAILS: updated spell to 0.9.10

diff --git a/audio-soft/pavucontrol/pavucontrol-0.9.10.tar.gz.sig
b/audio-soft/pavucontrol/pavucontrol-0.9.10.tar.gz.sig
deleted file mode 100644
index 69290b0..0000000
Binary files a/audio-soft/pavucontrol/pavucontrol-0.9.10.tar.gz.sig and
/dev/null differ
diff --git a/audio-soft/pavucontrol/pavucontrol-1.0.tar.gz.sig
b/audio-soft/pavucontrol/pavucontrol-1.0.tar.gz.sig
new file mode 100644
index 0000000..06b7b6b
Binary files /dev/null and
b/audio-soft/pavucontrol/pavucontrol-1.0.tar.gz.sig differ
diff --git a/crypto/ca-certificates/DETAILS b/crypto/ca-certificates/DETAILS
index 635c736..3c1b0a5 100755
--- a/crypto/ca-certificates/DETAILS
+++ b/crypto/ca-certificates/DETAILS
@@ -1,7 +1,7 @@
SPELL=ca-certificates
- VERSION=20111025
+ VERSION=20111211
SECURITY_PATCH=1
-
SOURCE_HASH=sha512:4be682158891110d32e8f065af64c597da09476263fdebb860d08387c873e7839b106b6f9ad6be7acfb4e0eb568274e2196377b4e0bbb61aafaeaecaeef88284
+
SOURCE_HASH=sha512:f6b3f22156d91c40a570f32162bad426f7c3426350fb28f5f4ea09f471111db2734e8e6c80e70e02da764fff33c4ae1508192f521dc7a4e5f769410e9742eea5
SOURCE=${SPELL}_${VERSION}_all.deb
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/c/$SPELL/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/crypto/ca-certificates/HISTORY b/crypto/ca-certificates/HISTORY
index 2ad597a..f7658ea 100644
--- a/crypto/ca-certificates/HISTORY
+++ b/crypto/ca-certificates/HISTORY
@@ -1,5 +1,9 @@
+2011-12-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 20111211
+
2011-10-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20111025
+
2011-09-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20110502+nmu1
SECURITY_PATCH=1 ( blacklist DigiNotar Root CA)
diff --git a/graphics/blender/BUILD b/graphics/blender/BUILD
index bb6d1c5..04c5616 100755
--- a/graphics/blender/BUILD
+++ b/graphics/blender/BUILD
@@ -12,6 +12,17 @@ EOF

fi &&

+#if is_depends_enabled $SPELL openexr; then
+#
+#cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
+#BF_OPENEXR="/usr"
+#BF_OPENJPEG_INC="/usr/include"
+#BF_OPENEXR_INC="${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include"
+#BF_OPENEXR_LIBPATH="${BF_OPENEXR}/lib"
+#EOF
+#
+#fi &&
+
if is_depends_enabled $SPELL lcms; then

cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
@@ -35,7 +46,7 @@ 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"
+OPTS="WITHOUT_BF_PYTHON_INSTALL=True WITH_BF_3DMOUSE=False $BLENDER_PLAYER
$BLENDER_GAMEENGINE $BLENDER_OCEANSIM $BLENDER_OGG $OPTS"

python ./scons/scons.py $OPTS

diff --git a/graphics/blender/CONFIGURE b/graphics/blender/CONFIGURE
index e7b583c..c61bebb 100755
--- a/graphics/blender/CONFIGURE
+++ b/graphics/blender/CONFIGURE
@@ -6,6 +6,10 @@ config_query_option BLENDER_GAMEENGINE "Build GameEngine?" y
\
"WITH_BF_GAMEENGINE=True" \
"WITH_BF_GAMEENGINE=False" &&

+config_query_option BLENDER_OCEANSIM "Build OceanSim?" y \
+ "WITH_BF_OCEANSIM=True" \
+ "WITH_BF_OCEANSIM=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 20efcf3..13de4f6 100755
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -26,7 +26,7 @@ depends libxrandr &&
depends libxxf86misc &&
depends libxinerama &&
depends freetype2 &&
-depends eigen2 &&
+depends eigen3 &&
depends bullet "" "" games &&

if [ "$BLENDER_OGG" == "WITH_BF_OGG=True" ]; then
@@ -75,10 +75,10 @@ optional_depends sdl
\
"WITH_BF_SDL=False" \
"Enable SDL support?" &&

-optional_depends openexr \
- "WITH_BF_OPENEXR=True" \
- "WITH_BF_OPENEXR=False" \
- "Enable openexr support?" &&
+#optional_depends openexr \
+# "WITH_BF_OPENEXR=True" \
+# "WITH_BF_OPENEXR=False" \
+# "Enable openexr support?" &&

optional_depends LIBAVCODEC \
"WITH_BF_FFMPEG=True" \
diff --git a/graphics/blender/DETAILS b/graphics/blender/DETAILS
index 78a09b5..6643216 100755
--- a/graphics/blender/DETAILS
+++ b/graphics/blender/DETAILS
@@ -10,10 +10,9 @@ 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}"
+ VERSION=2.61
+ SOURCE=$SPELL-${VERSION}.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION}"
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
diff --git a/graphics/blender/HISTORY b/graphics/blender/HISTORY
index 73fe9dd..18569e2 100644
--- a/graphics/blender/HISTORY
+++ b/graphics/blender/HISTORY
@@ -1,3 +1,11 @@
+2011-12-15 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated to 2.61
+ * CONFIGURE: added OceanSim option
+ * DEPENDS: changed eigen2 to eigen3
+ commented out openexr and use included until can figure out version
+ * PRE_BUILD: manually updated patches to apply
+ * BUILD: added OCEANSIM option
+
2011-11-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated to 2.60a
changed to use branch function variables
diff --git a/graphics/blender/PRE_BUILD b/graphics/blender/PRE_BUILD
index 61ea862..d6532ef 100755
--- a/graphics/blender/PRE_BUILD
+++ b/graphics/blender/PRE_BUILD
@@ -1,21 +1,18 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < $SCRIPT_DIRECTORY/blender-2.60a-desktop.patch &&
-patch -p1 < $SCRIPT_DIRECTORY/blender-2.60-doxyfile.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/blender-2.61-desktop.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.61-glew.patch &&
+rm -r extern/Eigen3 &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-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
-
-#patch < $SCRIPT_DIRECTORY/blender-2.60a-linux-3.patch
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-CVE-2009-3850.patch &&
+patch -p1 < $SCRIPT_DIRECTORY/blender-2.61-enable_site_module.patch &&

cat <<- EOF >> "${SOURCE_DIRECTORY}"/user-config.py
REL_CFLAGS=[]
diff --git a/graphics/blender/blender-2.60-doxyfile.patch
b/graphics/blender/blender-2.60-doxyfile.patch
deleted file mode 100644
index aa61c55..0000000
--- a/graphics/blender/blender-2.60-doxyfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 6955ee1..0000000
--- a/graphics/blender/blender-2.60-eigen.patch
+++ /dev/null
@@ -1,293 +0,0 @@
---- 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
deleted file mode 100644
index edc0c9b..0000000
--- a/graphics/blender/blender-2.60-glew.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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.60a-CVE-2009-3850-v3.patch
b/graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch
deleted file mode 100644
index fc0278d..0000000
--- a/graphics/blender/blender-2.60a-CVE-2009-3850-v3.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-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
deleted file mode 100644
index c774cbe..0000000
--- a/graphics/blender/blender-2.60a-desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 8a44c36..0000000
--- a/graphics/blender/blender-2.60a-enable_site_module.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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-linux-3.patch
b/graphics/blender/blender-2.60a-linux-3.patch
deleted file mode 100644
index 6a96b49..0000000
--- a/graphics/blender/blender-2.60a-linux-3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
deleted file mode 100644
index 6065171..0000000
Binary files a/graphics/blender/blender-2.60a.tar.gz.sig and /dev/null differ
diff --git a/graphics/blender/blender-2.61-CVE-2009-3850.patch
b/graphics/blender/blender-2.61-CVE-2009-3850.patch
new file mode 100644
index 0000000..06011bc
--- /dev/null
+++ b/graphics/blender/blender-2.61-CVE-2009-3850.patch
@@ -0,0 +1,152 @@
+diff -ur blender-orig/source/blender/blenkernel/intern/blender.c
blender-mod/source/blender/blenkernel/intern/blender.c
+--- blender-orig/source/blender/blenkernel/intern/blender.c 2011-12-15
17:30:08.668883213 -0600
++++ blender-mod/source/blender/blenkernel/intern/blender.c 2011-12-15
17:47:04.626925437 -0600
+@@ -144,6 +144,7 @@
+ 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
+ }
+
+Only in blender-mod/source/blender/blenkernel/intern: blender.c.orig
+diff -ur blender-orig/source/blender/makesrna/intern/rna_userdef.c
blender-mod/source/blender/makesrna/intern/rna_userdef.c
+--- blender-orig/source/blender/makesrna/intern/rna_userdef.c 2011-12-15
17:30:08.246883195 -0600
++++ blender-mod/source/blender/makesrna/intern/rna_userdef.c 2011-12-15
17:47:04.626925437 -0600
+@@ -114,9 +114,17 @@
+
+ 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)
+@@ -2729,6 +2737,8 @@
+ "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);
+Only in blender-mod/source/blender/makesrna/intern: rna_userdef.c.orig
+diff -ur blender-orig/source/blender/windowmanager/intern/wm_files.c
blender-mod/source/blender/windowmanager/intern/wm_files.c
+--- blender-orig/source/blender/windowmanager/intern/wm_files.c
2011-12-15 17:30:08.275883196 -0600
++++ blender-mod/source/blender/windowmanager/intern/wm_files.c 2011-12-15
17:49:09.061930590 -0600
+@@ -286,13 +286,18 @@
+
+ /* 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;
+ }
+
+
+Only in blender-mod/source/blender/windowmanager/intern: wm_files.c.orig
+Only in blender-mod/source/blender/windowmanager/intern: wm_files.c.rej
+diff -ur blender-orig/source/blender/windowmanager/intern/wm_operators.c
blender-mod/source/blender/windowmanager/intern/wm_operators.c
+--- blender-orig/source/blender/windowmanager/intern/wm_operators.c
2011-12-15 17:30:08.275883196 -0600
++++ blender-mod/source/blender/windowmanager/intern/wm_operators.c
2011-12-15 17:47:04.627925429 -0600
+@@ -1601,12 +1601,13 @@
+ 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);
+@@ -1618,6 +1619,8 @@
+
+ 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";
+@@ -1629,7 +1632,12 @@
+ 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 *************** */
+Only in blender-mod/source/blender/windowmanager/intern: wm_operators.c.orig
+diff -ur blender-orig/source/creator/creator.c
blender-mod/source/creator/creator.c
+--- blender-orig/source/creator/creator.c 2011-12-15 17:30:08.076883188
-0600
++++ blender-mod/source/creator/creator.c 2011-12-15 17:47:04.628925424
-0600
+@@ -262,6 +262,7 @@
+
+ printf("\n");
+
++ BLI_argsPrintArgDoc(ba, "-666");
+ BLI_argsPrintArgDoc(ba, "--enable-autoexec");
+ BLI_argsPrintArgDoc(ba, "--disable-autoexec");
+
+@@ -330,14 +331,14 @@
+ 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;
+ }
+
+@@ -1042,6 +1043,7 @@
+ # define PY_DISABLE_AUTO ", (compiled as non-standard default)"
+ #endif
+
++ 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);
+
+Only in blender-mod/source/creator: creator.c.orig
diff --git a/graphics/blender/blender-2.61-desktop.patch
b/graphics/blender/blender-2.61-desktop.patch
new file mode 100644
index 0000000..dc89ae6
--- /dev/null
+++ b/graphics/blender/blender-2.61-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.61
+ 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.61
++Icon=blender-2.61
+ Terminal=false
+ Type=Application
+ Categories=Graphics;3DGraphics;
diff --git a/graphics/blender/blender-2.61-eigen.patch
b/graphics/blender/blender-2.61-eigen.patch
new file mode 100644
index 0000000..538cac4
--- /dev/null
+++ b/graphics/blender/blender-2.61-eigen.patch
@@ -0,0 +1,521 @@
+diff -ur blender-orig/extern/libmv/bundle.sh
blender-mod/extern/libmv/bundle.sh
+--- blender-orig/extern/libmv/bundle.sh 2011-12-15 17:30:07.558883167
-0600
++++ blender-mod/extern/libmv/bundle.sh 2011-12-15 18:32:09.990037815 -0600
+@@ -116,7 +116,7 @@
+
+ set(INC
+ .
+- ../Eigen3
++ /usr/include/eigen3
+ ./third_party/ssba
+ ./third_party/ldl/Include
+ ../colamd/Include
+@@ -224,7 +224,7 @@
+ src = env.Glob("*.cpp")
+ $src
+
+-incs = '. ../Eigen3'
++incs = '. /usr/include/eigen3'
+ incs += ' ' + env['BF_PNG_INC']
+ incs += ' ' + env['BF_ZLIB_INC']
+
+diff -ur blender-orig/extern/libmv/CMakeLists.txt
blender-mod/extern/libmv/CMakeLists.txt
+--- blender-orig/extern/libmv/CMakeLists.txt 2011-12-15 17:30:07.536883165
-0600
++++ blender-mod/extern/libmv/CMakeLists.txt 2011-12-15 18:31:09.944035320
-0600
+@@ -24,7 +24,7 @@
+
+ set(INC
+ .
+- ../Eigen3
++ /usr/include/eigen3
+ third_party/ssba
+ third_party/ldl/Include
+ ../colamd/Include
+diff -ur blender-orig/extern/libmv/SConscript
blender-mod/extern/libmv/SConscript
+--- blender-orig/extern/libmv/SConscript 2011-12-15 17:30:07.536883165
-0600
++++ blender-mod/extern/libmv/SConscript 2011-12-15 18:30:39.513034068
-0600
+@@ -25,7 +25,7 @@
+ 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 -ur blender-orig/intern/itasc/CMakeLists.txt
blender-mod/intern/itasc/CMakeLists.txt
+--- blender-orig/intern/itasc/CMakeLists.txt 2011-12-15 17:30:09.145883233
-0600
++++ blender-mod/intern/itasc/CMakeLists.txt 2011-12-15 18:29:27.484031046
-0600
+@@ -24,11 +24,11 @@
+ # ***** END GPL LICENSE BLOCK *****
+
+ set(INC
+- ../../extern/Eigen3
++ /usr/include/eigen3
+ )
+
+ set(INC_SYS
+-
++ /usr/include/eigen3
+ )
+
+ set(SRC
+@@ -121,201 +121,201 @@
+ 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 -ur blender-orig/intern/itasc/SConscript
blender-mod/intern/itasc/SConscript
+--- blender-orig/intern/itasc/SConscript 2011-12-15 17:30:09.145883233
-0600
++++ blender-mod/intern/itasc/SConscript 2011-12-15 18:29:27.484031046
-0600
+@@ -5,7 +5,8 @@
+ sources += env.Glob('kdl/*.cpp')
+ sources += env.Glob('kdl/utilities/*.cpp')
+
+-incs = '. ../../extern/Eigen3'
++#incs = '. ../../extern/Eigen3'
++incs = '. /usr/include/eigen3'
+
+ defs = []
+
+diff -ur blender-orig/source/blender/ikplugin/CMakeLists.txt
blender-mod/source/blender/ikplugin/CMakeLists.txt
+--- blender-orig/source/blender/ikplugin/CMakeLists.txt 2011-12-15
17:30:08.276883196 -0600
++++ blender-mod/source/blender/ikplugin/CMakeLists.txt 2011-12-15
18:29:27.484031046 -0600
+@@ -49,7 +49,7 @@
+ if(WITH_IK_ITASC)
+ add_definitions(-DWITH_IK_ITASC)
+ list(APPEND INC
+- ../../../extern/Eigen3
++ /usr/include/eigen3
+ ../../../intern/itasc
+ )
+ list(APPEND SRC
+diff -ur blender-orig/source/blender/ikplugin/SConscript
blender-mod/source/blender/ikplugin/SConscript
+--- blender-orig/source/blender/ikplugin/SConscript 2011-12-15
17:30:08.276883196 -0600
++++ blender-mod/source/blender/ikplugin/SConscript 2011-12-15
18:29:27.484031046 -0600
+@@ -4,7 +4,7 @@
+ 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 -ur blender-orig/source/gameengine/Converter/CMakeLists.txt
blender-mod/source/gameengine/Converter/CMakeLists.txt
+--- blender-orig/source/gameengine/Converter/CMakeLists.txt 2011-12-15
17:30:08.812883219 -0600
++++ blender-mod/source/gameengine/Converter/CMakeLists.txt 2011-12-15
18:29:27.484031046 -0600
+@@ -50,7 +50,7 @@
+ ../../blender/makesrna
+ ../../blender/windowmanager
+ ../../../extern/bullet2/src
+- ../../../extern/Eigen3
++ /usr/include/eigen3
+ ../../../intern/container
+ ../../../intern/guardedalloc
+ ../../../intern/moto/include
+diff -ur blender-orig/source/gameengine/Converter/SConscript
blender-mod/source/gameengine/Converter/SConscript
+--- blender-orig/source/gameengine/Converter/SConscript 2011-12-15
17:30:08.825883219 -0600
++++ blender-mod/source/gameengine/Converter/SConscript 2011-12-15
18:29:27.485031053 -0600
+@@ -21,7 +21,8 @@
+ incs += ' #source/blender/makesrna'
+ incs += ' #source/blender/ikplugin'
+ incs += ' #extern/recastnavigation/Detour/Include'
+-incs += ' #extern/Eigen3'
++#incs += ' #extern/Eigen3'
++incs += ' /usr/include/eigen3'
+
+ incs += ' ' + env['BF_BULLET_INC']
+
diff --git a/graphics/blender/blender-2.61-enable_site_module.patch
b/graphics/blender/blender-2.61-enable_site_module.patch
new file mode 100644
index 0000000..d791257
--- /dev/null
+++ b/graphics/blender/blender-2.61-enable_site_module.patch
@@ -0,0 +1,34 @@
+diff -ur blender-2.61/source/blender/python/intern/bpy_interface.c
blender-mod/source/blender/python/intern/bpy_interface.c
+--- blender-2.61/source/blender/python/intern/bpy_interface.c 2011-12-13
13:48:28.000000000 -0600
++++ blender-mod/source/blender/python/intern/bpy_interface.c 2011-12-15
17:26:50.986874961 -0600
+@@ -219,11 +219,6 @@
+ * 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 -ur blender-2.61/source/gameengine/Ketsji/KX_PythonInit.cpp
blender-mod/source/gameengine/Ketsji/KX_PythonInit.cpp
+--- blender-2.61/source/gameengine/Ketsji/KX_PythonInit.cpp 2011-12-13
13:47:26.000000000 -0600
++++ blender-mod/source/gameengine/Ketsji/KX_PythonInit.cpp 2011-12-15
17:27:41.464877092 -0600
+@@ -1823,7 +1823,6 @@
+ STR_String pname = progname;
+ Py_SetProgramName(pname.Ptr());
+ #endif
+- Py_NoSiteFlag=1;
+ Py_FrozenFlag=1;
+
+ /* must run before python initializes */
+@@ -1896,7 +1895,6 @@
+ STR_String pname = progname;
+ Py_SetProgramName(pname.Ptr());
+ #endif
+- Py_NoSiteFlag=1;
+ Py_FrozenFlag=1;
+
+ initPyTypes();
diff --git a/graphics/blender/blender-2.61-glew.patch
b/graphics/blender/blender-2.61-glew.patch
new file mode 100644
index 0000000..1e31b52
--- /dev/null
+++ b/graphics/blender/blender-2.61-glew.patch
@@ -0,0 +1,49 @@
+diff -ur blender-2.61/CMakeLists.txt blender-mod/CMakeLists.txt
+--- blender-2.61/CMakeLists.txt 2011-12-13 13:57:52.000000000 -0600
++++ blender-mod/CMakeLists.txt 2011-12-15 16:43:02.083765807 -0600
+@@ -156,7 +156,7 @@
+
+ if(UNIX AND NOT APPLE)
+ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode
input)" 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)
+ else()
+diff -ur blender-2.61/extern/CMakeLists.txt blender-mod/extern/CMakeLists.txt
+--- blender-2.61/extern/CMakeLists.txt 2011-12-13 13:57:20.000000000 -0600
++++ blender-mod/extern/CMakeLists.txt 2011-12-15 16:40:53.775760453 -0600
+@@ -40,10 +40,6 @@
+ add_subdirectory(binreloc)
+ endif()
+
+-if(WITH_BUILTIN_GLEW)
+- add_subdirectory(glew)
+-endif()
+-
+ if(WITH_GAMEENGINE)
+ add_subdirectory(recastnavigation)
+ endif()
+diff -ur blender-2.61/extern/SConscript blender-mod/extern/SConscript
+--- blender-2.61/extern/SConscript 2011-12-13 13:57:20.000000000 -0600
++++ blender-mod/extern/SConscript 2011-12-15 16:39:52.497757875 -0600
+@@ -2,7 +2,6 @@
+
+ Import('env')
+
+-SConscript(['glew/SConscript'])
+ SConscript(['colamd/SConscript'])
+
+ if env['WITH_BF_GAMEENGINE']:
+diff -ur blender-2.61/source/blender/editors/include/BIF_gl.h
blender-mod/source/blender/editors/include/BIF_gl.h
+--- blender-2.61/source/blender/editors/include/BIF_gl.h 2011-12-13
13:52:45.000000000 -0600
++++ blender-mod/source/blender/editors/include/BIF_gl.h 2011-12-15
16:41:59.989763237 -0600
+@@ -33,7 +33,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
diff --git a/graphics/blender/blender-2.61.tar.gz.sig
b/graphics/blender/blender-2.61.tar.gz.sig
new file mode 100644
index 0000000..4285b54
Binary files /dev/null and b/graphics/blender/blender-2.61.tar.gz.sig differ
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index 35d373f..94eeb76 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -37,7 +37,7 @@ config_query_option QT_XRAMA 'Enable Xinerama support?'
n \
'-no-xinerama' &&

config_query_option QT_GIF 'Enable GIF support?' y \
- '-qt-gif' \
+ '' \
'-no-gif' &&

config_query_option QT_EXCEPT 'Disable exception checking' n \
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 0fff379..446dfcd 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,8 +2,8 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.7.4
-
SOURCE_HASH=sha512:8dcb7d2e9069205bd80eeecbeb62a6ab727f9e327cbfc03003fe4f1caea364771d3c7e3a12347644aef1c51898680c08693cc76e2950ea8f7487223404b6581c
+ VERSION=4.8.0
+
SOURCE_HASH=sha512:b37f2d5fe3cebdcc7ebd5b6bc68ea03f4cabeadc492c77d7c18d00ede5c254adb57fcbe5cec6326072304db49e69e59c14af7e90875138c3b2f255237a99a78f
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=4
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 1872b09..fb3818b 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2011-12-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.0
+ * CONFIGURE: -qt-gif removed
+
2011-09-13 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated sha512 only doc/ was changed (fixes #198)




  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (09f30d0a6c131fb383567af38bf12f9d1a231431), Vlad Glagolev, 12/16/2011

Archive powered by MHonArc 2.6.24.

Top of Page