diff options
Diffstat (limited to 'media-gfx/blender/files/blender-2.60-bullet.patch')
| -rw-r--r-- | media-gfx/blender/files/blender-2.60-bullet.patch | 192 |
1 files changed, 0 insertions, 192 deletions
diff --git a/media-gfx/blender/files/blender-2.60-bullet.patch b/media-gfx/blender/files/blender-2.60-bullet.patch deleted file mode 100644 index 05e47fb..0000000 --- a/media-gfx/blender/files/blender-2.60-bullet.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -Npur blender-2.61.orig/build_files/scons/tools/Blender.py blender-2.61/build_files/scons/tools/Blender.py ---- blender-2.61.orig/build_files/scons/tools/Blender.py 2011-12-20 22:36:19.299620183 +0100 -+++ blender-2.61/build_files/scons/tools/Blender.py 2011-12-20 22:36:50.517619833 +0100 -@@ -270,6 +270,8 @@ def setup_syslibs(lenv): - syslibs += Split(lenv['BF_SDL_LIB']) - if not lenv['WITH_BF_STATICOPENGL']: - syslibs += Split(lenv['BF_OPENGL_LIB']) -+ if lenv['WITH_BF_BULLET']: -+ syslibs += Split(lenv['BF_BULLET_LIB']) - if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross', 'win64-vc'): - syslibs += Split(lenv['BF_PTHREADS_LIB']) - if lenv['WITH_BF_COLLADA']: -diff -Npur blender-2.61.orig/doc/doxygen/Doxyfile blender-2.61/doc/doxygen/Doxyfile ---- blender-2.61.orig/doc/doxygen/Doxyfile 2011-12-20 22:36:19.254620184 +0100 -+++ blender-2.61/doc/doxygen/Doxyfile 2011-12-20 22:36:50.544619631 +0100 -@@ -617,8 +617,7 @@ INPUT = doxygen.main \ - doxygen.intern \ - doxygen.extern \ - ../../source \ -- ../../intern \ -- ../../extern/bullet2 -+ ../../intern - - # This tag can be used to specify the character encoding of the source files - # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -diff -Npur blender-2.61.orig/extern/CMakeLists.txt blender-2.61/extern/CMakeLists.txt ---- blender-2.61.orig/extern/CMakeLists.txt 2011-12-20 22:36:19.296620183 +0100 -+++ blender-2.61/extern/CMakeLists.txt 2011-12-20 22:36:50.544619631 +0100 -@@ -28,10 +28,6 @@ remove_strict_flags() - - add_subdirectory(colamd) - --if(WITH_BULLET) -- add_subdirectory(bullet2) --endif() -- - if(WITH_MOD_CLOTH_ELTOPO) - add_subdirectory(eltopo) - endif() -diff -Npur blender-2.61.orig/extern/SConscript blender-2.61/extern/SConscript ---- blender-2.61.orig/extern/SConscript 2011-12-20 22:36:19.295620183 +0100 -+++ blender-2.61/extern/SConscript 2011-12-20 22:36:50.544619631 +0100 -@@ -10,9 +10,6 @@ if env['WITH_BF_GAMEENGINE']: - if env['WITH_BF_ELTOPO']: - SConscript(['eltopo/SConscript']) - --if env['WITH_BF_BULLET']: -- SConscript(['bullet2/src/SConscript']) -- - if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': - SConscript(['libredcode/SConscript']) - -diff -Npur blender-2.61.orig/intern/smoke/CMakeLists.txt blender-2.61/intern/smoke/CMakeLists.txt ---- blender-2.61.orig/intern/smoke/CMakeLists.txt 2011-12-20 22:36:19.501620180 +0100 -+++ blender-2.61/intern/smoke/CMakeLists.txt 2011-12-20 22:36:50.544619631 +0100 -@@ -26,10 +26,10 @@ - set(INC - intern - ../memutil -- ../../extern/bullet2/src - ) - - set(INC_SYS -+ /usr/include/bullet2 - ${PNG_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIRS} - ) -diff -Npur blender-2.61.orig/intern/smoke/SConscript blender-2.61/intern/smoke/SConscript ---- blender-2.61.orig/intern/smoke/SConscript 2011-12-20 22:36:19.501620180 +0100 -+++ blender-2.61/intern/smoke/SConscript 2011-12-20 22:36:50.545619631 +0100 -@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']: - defs += ' PARALLEL=1' - - incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] --incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' -+incs += ' intern /usr/include/bullet ../memutil ../guardealloc ' - - if env['WITH_BF_FFTW3']: - defs += ' WITH_FFTW3' -diff -Npur blender-2.61.orig/source/blender/blenkernel/CMakeLists.txt blender-2.61/source/blender/blenkernel/CMakeLists.txt ---- blender-2.61.orig/source/blender/blenkernel/CMakeLists.txt 2011-12-20 22:36:19.325620183 +0100 -+++ blender-2.61/source/blender/blenkernel/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100 -@@ -253,8 +253,8 @@ if(WITH_AUDASPACE) - endif() - - if(WITH_BULLET) -- list(APPEND INC -- ../../../extern/bullet2/src -+ list(APPEND INC_SYS -+ /usr/include/bullet - ) - add_definitions(-DUSE_BULLET) - endif() -diff -Npur blender-2.61.orig/source/blender/blenkernel/SConscript blender-2.61/source/blender/blenkernel/SConscript ---- blender-2.61.orig/source/blender/blenkernel/SConscript 2011-12-20 22:36:19.325620183 +0100 -+++ blender-2.61/source/blender/blenkernel/SConscript 2011-12-20 22:36:50.545619631 +0100 -@@ -9,7 +9,7 @@ incs += ' ../blenlib ../blenfont ../make - incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' - incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' - incs += ' #/intern/iksolver/extern ../blenloader' --incs += ' #/extern/bullet2/src' -+incs += ' /usr/include/bullet' - incs += ' #/intern/opennl/extern #/intern/bsp/extern' - incs += ' ../gpu #/extern/glew/include' - incs += ' #/intern/smoke/extern' -diff -Npur blender-2.61.orig/source/gameengine/BlenderRoutines/CMakeLists.txt blender-2.61/source/gameengine/BlenderRoutines/CMakeLists.txt ---- blender-2.61.orig/source/gameengine/BlenderRoutines/CMakeLists.txt 2011-12-20 22:36:19.307620183 +0100 -+++ blender-2.61/source/gameengine/BlenderRoutines/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100 -@@ -23,7 +23,6 @@ set(INC - ../../blender/makesdna - ../../blender/makesrna - ../../blender/windowmanager -- ../../../extern/bullet2/src - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include -@@ -32,7 +31,7 @@ set(INC - ) - - set(INC_SYS -- -+ /usr/include/bullet - ) - - set(SRC -diff -Npur blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt blender-2.61/source/gameengine/Converter/CMakeLists.txt ---- blender-2.61.orig/source/gameengine/Converter/CMakeLists.txt 2011-12-20 22:36:19.311620183 +0100 -+++ blender-2.61/source/gameengine/Converter/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100 -@@ -49,7 +49,6 @@ set(INC - ../../blender/makesdna - ../../blender/makesrna - ../../blender/windowmanager -- ../../../extern/bullet2/src - ../../../intern/container - ../../../intern/guardedalloc - ../../../intern/moto/include -@@ -59,6 +58,7 @@ set(INC - - set(INC_SYS - /usr/include/eigen3 -+ /usr/include/bullet - ) - - set(SRC -diff -Npur blender-2.61.orig/source/gameengine/Ketsji/CMakeLists.txt blender-2.61/source/gameengine/Ketsji/CMakeLists.txt ---- blender-2.61.orig/source/gameengine/Ketsji/CMakeLists.txt 2011-12-20 22:36:19.317620183 +0100 -+++ blender-2.61/source/gameengine/Ketsji/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100 -@@ -241,9 +241,11 @@ endif() - - if(WITH_BULLET) - list(APPEND INC -- ../../../extern/bullet2/src - ../Physics/Bullet - ) -+ list(APPEND INC_SYS -+ /usr/include/bullet -+ ) - add_definitions(-DUSE_BULLET) - endif() - -diff -Npur blender-2.61.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp blender-2.61/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp ---- blender-2.61.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2011-12-20 22:36:19.306620183 +0100 -+++ blender-2.61/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp 2011-12-20 22:37:37.479618806 +0100 -@@ -2804,7 +2804,8 @@ float CcdPhysicsEnvironment::getApplied - - void CcdPhysicsEnvironment::exportFile(const char* filename) - { -- btDefaultSerializer* serializer = new btDefaultSerializer(); -+ // Workaround bullet-2.77 api change. -+ btDefaultSerializer* serializer = new btDefaultSerializer(0); - - - for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++) -diff -Npur blender-2.61.orig/source/gameengine/Physics/Bullet/CMakeLists.txt blender-2.61/source/gameengine/Physics/Bullet/CMakeLists.txt ---- blender-2.61.orig/source/gameengine/Physics/Bullet/CMakeLists.txt 2011-12-20 22:36:19.306620183 +0100 -+++ blender-2.61/source/gameengine/Physics/Bullet/CMakeLists.txt 2011-12-20 22:36:50.545619631 +0100 -@@ -37,7 +37,6 @@ set(INC - ../../../blender/blenkernel - ../../../blender/blenlib - ../../../blender/makesdna -- ../../../../extern/bullet2/src - ../../../../intern/container - ../../../../intern/guardedalloc - ../../../../intern/moto/include -@@ -45,6 +44,7 @@ set(INC - ) - - set(INC_SYS -+ /usr/include/bullet - ${GLEW_INCLUDE_PATH} - ${PYTHON_INCLUDE_DIRS} - ) |