Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 314179 Details for
Bug 394871
media-gfx/blender-2.63a version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
blender-2.63a-colamd.patch
blender-2.63a-colamd.patch (text/plain), 7.96 KB, created by
Simone Scanzoni
on 2012-06-04 11:51:52 UTC
(
hide
)
Description:
blender-2.63a-colamd.patch
Filename:
MIME Type:
Creator:
Simone Scanzoni
Created:
2012-06-04 11:51:52 UTC
Size:
7.96 KB
patch
obsolete
>diff -Npur blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py blender-2.63a/build_files/scons/config/linux-config.py >--- blender-2.63a.eigen-bullet/build_files/scons/config/linux-config.py 2012-05-10 16:53:29.000000000 +0200 >+++ blender-2.63a/build_files/scons/config/linux-config.py 2012-06-03 18:43:55.121126001 +0200 >@@ -192,6 +192,11 @@ BF_EXPAT = '/usr' > BF_EXPAT_LIB = 'expat' > BF_EXPAT_LIBPATH = '/usr/lib' > >+WITH_BF_COLAMD = True >+BF_COLAMD = '#extern/colamd' >+BF_COLAMD_INC = '${BF_COLAMD}/include' >+BF_COLAMD_LIB = 'extern_colamd' >+ > WITH_BF_JEMALLOC = False > WITH_BF_STATICJEMALLOC = False > BF_JEMALLOC = '/usr' >diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py blender-2.63a/build_files/scons/tools/Blender.py >--- blender-2.63a.eigen-bullet/build_files/scons/tools/Blender.py 2012-06-03 18:43:16.699242778 +0200 >+++ blender-2.63a/build_files/scons/tools/Blender.py 2012-06-03 18:43:55.123126255 +0200 >@@ -279,6 +279,8 @@ def setup_syslibs(lenv): > else: > syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) > syslibs.append(lenv['BF_EXPAT_LIB']) >+ if lenv['WITH_BF_COLAMD']: >+ syslibs += Split(lenv['BF_COLAMD_LIB']) > > if lenv['WITH_BF_JEMALLOC']: > if not lenv['WITH_BF_STATICJEMALLOC']: >diff -Npur blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py blender-2.63a/build_files/scons/tools/btools.py >--- blender-2.63a.eigen-bullet/build_files/scons/tools/btools.py 2012-05-10 16:53:28.000000000 +0200 >+++ blender-2.63a/build_files/scons/tools/btools.py 2012-06-03 18:43:55.124126382 +0200 >@@ -126,6 +126,7 @@ def validate_arguments(args, bc): > 'WITH_BF_FFTW3', 'BF_FFTW3', 'BF_FFTW3_INC', 'BF_FFTW3_LIB', 'BF_FFTW3_LIBPATH', 'WITH_BF_STATICFFTW3', 'BF_FFTW3_LIB_STATIC', > 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', > 'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_INC', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH', 'BF_EXPAT', 'BF_EXPAT_LIB', 'BF_EXPAT_LIBPATH', >+ 'WITH_BF_COLAMD', 'BF_COLAMD', 'BF_COLAMD_INC', 'BF_COLAMD_LIB', > 'WITH_BF_PLAYER', > 'WITH_BF_NOBLENDER', > 'WITH_BF_BINRELOC', >@@ -455,6 +456,11 @@ def read_opts(env, cfg, args): > ('BF_EXPAT_LIB', 'Expat library', ''), > ('BF_EXPAT_LIBPATH', 'Expat library path', ''), > >+ (BoolVariable('WITH_BF_COLAMD', 'Use Colamd if true', True)), >+ ('BF_COLAMD', 'Colamd base dir', ''), >+ ('BF_COLAMD_INC', 'Colamd include path', ''), >+ ('BF_COLAMD_LIB', 'Colamd library', ''), >+ > (BoolVariable('WITH_BF_JEMALLOC', 'Use jemalloc if true', False)), > (BoolVariable('WITH_BF_STATICJEMALLOC', 'Staticly link to jemalloc', False)), > ('BF_JEMALLOC', 'jemalloc base path', ''), >diff -Npur blender-2.63a.eigen-bullet/extern/libmv/bundle.sh blender-2.63a/extern/libmv/bundle.sh >--- blender-2.63a.eigen-bullet/extern/libmv/bundle.sh 2012-06-03 18:42:31.626514266 +0200 >+++ blender-2.63a/extern/libmv/bundle.sh 2012-06-03 18:43:55.125126509 +0200 >@@ -122,13 +122,13 @@ set(INC > . > third_party/ssba > third_party/ldl/Include >- ../colamd/Include > ) > > set(INC_SYS > /usr/include/eigen3 > \${PNG_INCLUDE_DIR} > \${ZLIB_INCLUDE_DIRS} >+ \${COLAMD_INCLUDE_DIRS} > ) > > >@@ -247,6 +247,7 @@ $src > incs = '. /usr/include/eigen3' > incs += ' ' + env['BF_PNG_INC'] > incs += ' ' + env['BF_ZLIB_INC'] >+incs += ' ' + env['BF_COLAMD_INC'] > > if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): > incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' >@@ -276,7 +277,7 @@ else: > ccflags_libmv += Split(env['REL_CCFLAGS']) > cxxflags_libmv += Split(env['REL_CXXFLAGS']) > >-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' >+incs += ' ./third_party/ssba ./third_party/ldl/Include' > > env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) > EOF >diff -Npur blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt blender-2.63a/extern/libmv/CMakeLists.txt >--- blender-2.63a.eigen-bullet/extern/libmv/CMakeLists.txt 2012-06-03 18:42:31.627514393 +0200 >+++ blender-2.63a/extern/libmv/CMakeLists.txt 2012-06-03 18:43:55.125126509 +0200 >@@ -30,13 +30,13 @@ set(INC > . > third_party/ssba > third_party/ldl/Include >- ../colamd/Include > ) > > set(INC_SYS > /usr/include/eigen3 > ${PNG_INCLUDE_DIR} > ${ZLIB_INCLUDE_DIRS} >+ ${COLAMD_INCLUDE_DIRS} > ) > > >diff -Npur blender-2.63a.eigen-bullet/extern/libmv/SConscript blender-2.63a/extern/libmv/SConscript >--- blender-2.63a.eigen-bullet/extern/libmv/SConscript 2012-06-03 18:42:31.627514393 +0200 >+++ blender-2.63a/extern/libmv/SConscript 2012-06-03 18:43:55.127126763 +0200 >@@ -33,6 +33,7 @@ src += env.Glob('third_party/ssba/Math/* > incs = '. /usr/include/eigen3' > incs += ' ' + env['BF_PNG_INC'] > incs += ' ' + env['BF_ZLIB_INC'] >+incs += ' ' + env['BF_COLAMD_INC'] > > if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): > incs += ' ./third_party/glog/src/windows ./third_party/glog/src/windows/glog' >@@ -62,6 +63,6 @@ else: > ccflags_libmv += Split(env['REL_CCFLAGS']) > cxxflags_libmv += Split(env['REL_CXXFLAGS']) > >-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' >+incs += ' ./third_party/ssba ./third_party/ldl/Include' > > env.BlenderLib ( libname = 'extern_libmv', sources=src, includes=Split(incs), defines=defs, libtype=['extern', 'player'], priority=[20,137], compileflags=cflags_libmv, cc_compileflags=ccflags_libmv, cxx_compileflags=cxxflags_libmv ) >diff -Npur blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp >--- blender-2.63a.eigen-bullet/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-05-10 16:54:38.000000000 +0200 >+++ blender-2.63a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp 2012-06-03 18:43:55.128126890 +0200 >@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o > > #if defined(V3DLIB_ENABLE_SUITESPARSE) > //# include "COLAMD/Include/colamd.h" >-# include "colamd.h" >+# include <colamd.h> > extern "C" > { > //# include "LDL/Include/ldl.h" >diff -Npur blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt blender-2.63a/intern/opennl/CMakeLists.txt >--- blender-2.63a.eigen-bullet/intern/opennl/CMakeLists.txt 2012-05-10 16:46:04.000000000 +0200 >+++ blender-2.63a/intern/opennl/CMakeLists.txt 2012-06-03 18:43:55.129127017 +0200 >@@ -40,11 +40,10 @@ add_definitions( > set(INC > extern > superlu >- ../../extern/colamd/Include > ) > > set(INC_SYS >- >+ /usr/include > ) > > set(SRC >diff -Npur blender-2.63a.eigen-bullet/intern/opennl/SConscript blender-2.63a/intern/opennl/SConscript >--- blender-2.63a.eigen-bullet/intern/opennl/SConscript 2012-05-10 16:46:04.000000000 +0200 >+++ blender-2.63a/intern/opennl/SConscript 2012-06-03 18:43:55.129127017 +0200 >@@ -3,7 +3,7 @@ Import ('env') > > sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') > >-incs = 'extern superlu ../../extern/colamd/Include' >+incs = 'extern superlu /usr/include' > > if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')): > env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) >diff -Npur blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c blender-2.63a/intern/opennl/superlu/get_perm_c.c >--- blender-2.63a.eigen-bullet/intern/opennl/superlu/get_perm_c.c 2012-05-10 16:46:04.000000000 +0200 >+++ blender-2.63a/intern/opennl/superlu/get_perm_c.c 2012-06-03 18:43:55.130127145 +0200 >@@ -10,7 +10,7 @@ > */ > > #include "ssp_defs.h" >-#include "colamd.h" >+#include <colamd.h> > > extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, > int *, int *, int *, int *, int *);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 394871
:
295977
|
295979
|
295981
|
295983
|
300193
|
301289
|
301297
|
314171
|
314175
|
314177
| 314179 |
314181
|
314183
|
314185
|
314187
|
314189
|
314191
|
314195
|
314197