| 1 |
flameeyes 12/11/22 05:20:32 |
| 2 |
|
| 3 |
Modified: series |
| 4 |
Added: 0120-unbundle.patch |
| 5 |
Removed: 0120_all_openjpeg.patch 0130_all_glew.patch |
| 6 |
0140_all_eigen.patch 0150_all_bullet.patch |
| 7 |
0160_all_colamd.patch 0330-system-ldl.patch |
| 8 |
0340-system-glog-gflags.patch |
| 9 |
Log: |
| 10 |
Merge all the unbundling patches in a single one. This simplifies it quite a bit. |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.5 src/patchsets/blender/2.64a/series |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/blender/2.64a/series?rev=1.5&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/blender/2.64a/series?rev=1.5&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/blender/2.64a/series?r1=1.4&r2=1.5 |
| 18 |
|
| 19 |
Index: series |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo/src/patchsets/blender/2.64a/series,v |
| 22 |
retrieving revision 1.4 |
| 23 |
retrieving revision 1.5 |
| 24 |
diff -u -r1.4 -r1.5 |
| 25 |
--- series 18 Nov 2012 00:56:41 -0000 1.4 |
| 26 |
+++ series 22 Nov 2012 05:20:32 -0000 1.5 |
| 27 |
@@ -1,14 +1,8 @@ |
| 28 |
0100_all_collada.patch |
| 29 |
0110_all_doxyfile.patch |
| 30 |
-0120_all_openjpeg.patch |
| 31 |
-0130_all_glew.patch |
| 32 |
-0140_all_eigen.patch |
| 33 |
-0150_all_bullet.patch |
| 34 |
-0160_all_colamd.patch |
| 35 |
+0120-unbundle.patch |
| 36 |
0180_all_CVE-2009-3850.patch |
| 37 |
0200_all_opencollada-debug.patch |
| 38 |
0220_all_crash.patch |
| 39 |
0300-scons-failure.patch |
| 40 |
0320-libav-0.8.patch |
| 41 |
-0330-system-ldl.patch |
| 42 |
-0340-system-glog-gflags.patch |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 src/patchsets/blender/2.64a/0120-unbundle.patch |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/blender/2.64a/0120-unbundle.patch?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/blender/2.64a/0120-unbundle.patch?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: 0120-unbundle.patch |
| 52 |
=================================================================== |
| 53 |
Index: blender-2.64a/extern/libredcode/SConscript |
| 54 |
=================================================================== |
| 55 |
--- blender-2.64a.orig/extern/libredcode/SConscript |
| 56 |
+++ blender-2.64a/extern/libredcode/SConscript |
| 57 |
@@ -7,7 +7,8 @@ import shutil |
| 58 |
Import('env') |
| 59 |
|
| 60 |
sources = env.Glob('*.c') |
| 61 |
-incs = '. ../libopenjpeg' |
| 62 |
+#incs = '. ../libopenjpeg' |
| 63 |
+incs = '. /usr/include' |
| 64 |
|
| 65 |
env.BlenderLib ( libname='extern_redcode', |
| 66 |
sources=sources, includes=Split(incs), |
| 67 |
Index: blender-2.64a/extern/SConscript |
| 68 |
=================================================================== |
| 69 |
--- blender-2.64a.orig/extern/SConscript |
| 70 |
+++ blender-2.64a/extern/SConscript |
| 71 |
@@ -2,7 +2,6 @@ |
| 72 |
|
| 73 |
Import('env') |
| 74 |
|
| 75 |
-SConscript(['glew/SConscript']) |
| 76 |
SConscript(['colamd/SConscript']) |
| 77 |
|
| 78 |
if env['WITH_BF_GAMEENGINE']: |
| 79 |
@@ -14,9 +13,6 @@ if env['WITH_BF_ELTOPO']: |
| 80 |
if env['WITH_BF_BULLET']: |
| 81 |
SConscript(['bullet2/src/SConscript']) |
| 82 |
|
| 83 |
-if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '': |
| 84 |
- SConscript(['libopenjpeg/SConscript']) |
| 85 |
- |
| 86 |
if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': |
| 87 |
SConscript(['libredcode/SConscript']) |
| 88 |
|
| 89 |
Index: blender-2.64a/build_files/scons/tools/Blender.py |
| 90 |
=================================================================== |
| 91 |
--- blender-2.64a.orig/build_files/scons/tools/Blender.py |
| 92 |
+++ blender-2.64a/build_files/scons/tools/Blender.py |
| 93 |
@@ -271,6 +271,8 @@ def setup_syslibs(lenv): |
| 94 |
syslibs += Split(lenv['BF_FFMPEG_LIB']) |
| 95 |
if lenv['WITH_BF_OGG']: |
| 96 |
syslibs += Split(lenv['BF_OGG_LIB']) |
| 97 |
+ if lenv['WITH_BF_OPENJPEG']: |
| 98 |
+ syslibs += Split(lenv['BF_OPENJPEG_LIB']) |
| 99 |
if lenv['WITH_BF_JACK']: |
| 100 |
syslibs += Split(lenv['BF_JACK_LIB']) |
| 101 |
if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']: |
| 102 |
@@ -292,6 +294,10 @@ def setup_syslibs(lenv): |
| 103 |
else: |
| 104 |
syslibs += Split(lenv['BF_OPENCOLLADA_LIB']) |
| 105 |
syslibs.append(lenv['BF_EXPAT_LIB']) |
| 106 |
+ syslibs += [ |
| 107 |
+ 'BulletSoftBody', 'BulletDynamics', 'BulletCollision', 'LinearMath', |
| 108 |
+ 'colamd', 'ldl', 'glog', 'gflags', 'ceres' |
| 109 |
+ ] |
| 110 |
|
| 111 |
if lenv['WITH_BF_JEMALLOC']: |
| 112 |
if not lenv['WITH_BF_STATICJEMALLOC']: |
| 113 |
Index: blender-2.64a/doc/doxygen/Doxyfile |
| 114 |
=================================================================== |
| 115 |
--- blender-2.64a.orig/doc/doxygen/Doxyfile |
| 116 |
+++ blender-2.64a/doc/doxygen/Doxyfile |
| 117 |
@@ -617,8 +617,7 @@ INPUT = doxygen.main \ |
| 118 |
doxygen.intern \ |
| 119 |
doxygen.extern \ |
| 120 |
../../source \ |
| 121 |
- ../../intern \ |
| 122 |
- ../../extern/bullet2 |
| 123 |
+ ../../intern |
| 124 |
|
| 125 |
# This tag can be used to specify the character encoding of the source files |
| 126 |
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is |
| 127 |
Index: blender-2.64a/extern/libmv/bundle.sh |
| 128 |
=================================================================== |
| 129 |
--- blender-2.64a.orig/extern/libmv/bundle.sh |
| 130 |
+++ blender-2.64a/extern/libmv/bundle.sh |
| 131 |
@@ -124,7 +124,6 @@ cat > CMakeLists.txt << EOF |
| 132 |
|
| 133 |
set(INC |
| 134 |
. |
| 135 |
- ../Eigen3 |
| 136 |
third_party/ssba |
| 137 |
third_party/ldl/Include |
| 138 |
../colamd/Include |
| 139 |
@@ -132,6 +131,7 @@ set(INC |
| 140 |
) |
| 141 |
|
| 142 |
set(INC_SYS |
| 143 |
+ /usr/include/eigen3 |
| 144 |
\${PNG_INCLUDE_DIR} |
| 145 |
\${ZLIB_INCLUDE_DIRS} |
| 146 |
) |
| 147 |
@@ -251,7 +251,7 @@ defs.append('GOOGLE_GLOG_DLL_DECL=') |
| 148 |
src = env.Glob("*.cpp") |
| 149 |
$src |
| 150 |
|
| 151 |
-incs = '. ../Eigen3 third_party/ceres/include' |
| 152 |
+incs = '. /usr/include/eigen3 third_party/ceres/include' |
| 153 |
incs += ' ' + env['BF_PNG_INC'] |
| 154 |
incs += ' ' + env['BF_ZLIB_INC'] |
| 155 |
|
| 156 |
Index: blender-2.64a/extern/libmv/libmv-capi.cpp |
| 157 |
=================================================================== |
| 158 |
--- blender-2.64a.orig/extern/libmv/libmv-capi.cpp |
| 159 |
+++ blender-2.64a/extern/libmv/libmv-capi.cpp |
| 160 |
@@ -34,7 +34,7 @@ |
| 161 |
|
| 162 |
#include "libmv-capi.h" |
| 163 |
|
| 164 |
-#include "third_party/gflags/gflags/gflags.h" |
| 165 |
+#include "gflags/gflags.h" |
| 166 |
#include "glog/logging.h" |
| 167 |
#include "libmv/logging/logging.h" |
| 168 |
|
| 169 |
Index: blender-2.64a/extern/libmv/SConscript |
| 170 |
=================================================================== |
| 171 |
--- blender-2.64a.orig/extern/libmv/SConscript |
| 172 |
+++ blender-2.64a/extern/libmv/SConscript |
| 173 |
@@ -25,12 +25,10 @@ src += env.Glob('libmv/numeric/*.cc') |
| 174 |
src += env.Glob('libmv/simple_pipeline/*.cc') |
| 175 |
src += env.Glob('libmv/tracking/*.cc') |
| 176 |
src += env.Glob('third_party/fast/*.c') |
| 177 |
-src += env.Glob('third_party/gflags/*.cc') |
| 178 |
-src += env.Glob('third_party/ldl/Source/*.c') |
| 179 |
src += env.Glob('third_party/ssba/Geometry/*.cpp') |
| 180 |
src += env.Glob('third_party/ssba/Math/*.cpp') |
| 181 |
|
| 182 |
-incs = '. ../Eigen3 third_party/ceres/include' |
| 183 |
+incs = '. /usr/include/eigen3 third_party/ceres/include' |
| 184 |
incs += ' ' + env['BF_PNG_INC'] |
| 185 |
incs += ' ' + env['BF_ZLIB_INC'] |
| 186 |
|
| 187 |
@@ -55,15 +53,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'w |
| 188 |
ccflags_libmv += Split(env['REL_CCFLAGS']) |
| 189 |
cxxflags_libmv += Split(env['REL_CXXFLAGS']) |
| 190 |
else: |
| 191 |
- src += env.Glob("third_party/glog/src/*.cc") |
| 192 |
- incs += ' ./third_party/glog/src' |
| 193 |
if not env['BF_DEBUG']: |
| 194 |
cflags_libmv += Split(env['REL_CFLAGS']) |
| 195 |
ccflags_libmv += Split(env['REL_CCFLAGS']) |
| 196 |
cxxflags_libmv += Split(env['REL_CXXFLAGS']) |
| 197 |
|
| 198 |
-incs += ' ./third_party/ssba ./third_party/ldl/Include ../colamd/Include' |
| 199 |
+incs += ' ./third_party/ssba' |
| 200 |
|
| 201 |
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 ) |
| 202 |
- |
| 203 |
-SConscript(['third_party/SConscript']) |
| 204 |
Index: blender-2.64a/extern/libmv/third_party/ceres/bundle.sh |
| 205 |
=================================================================== |
| 206 |
--- blender-2.64a.orig/extern/libmv/third_party/ceres/bundle.sh |
| 207 |
+++ blender-2.64a/extern/libmv/third_party/ceres/bundle.sh |
| 208 |
@@ -117,13 +117,13 @@ cat > CMakeLists.txt << EOF |
| 209 |
|
| 210 |
set(INC |
| 211 |
. |
| 212 |
- ../../../Eigen3 |
| 213 |
include |
| 214 |
internal |
| 215 |
../gflags |
| 216 |
) |
| 217 |
|
| 218 |
set(INC_SYS |
| 219 |
+ /usr/include/eigen3 |
| 220 |
) |
| 221 |
|
| 222 |
set(SRC |
| 223 |
@@ -215,7 +215,7 @@ defs.append('CERES_RESTRICT_SCHUR_SPECIA |
| 224 |
if 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']: |
| 225 |
defs.append('CERES_NO_TR1') |
| 226 |
|
| 227 |
-incs = '. ../../ ../../../Eigen3 ./include ./internal ../gflags' |
| 228 |
+incs = '. ../../ /usr/include/eigen3 ./include ./internal ../gflags' |
| 229 |
|
| 230 |
# work around broken hashtable in 10.5 SDK |
| 231 |
if env['OURPLATFORM'] == 'darwin' and env['WITH_BF_BOOST']: |
| 232 |
Index: blender-2.64a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp |
| 233 |
=================================================================== |
| 234 |
--- blender-2.64a.orig/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp |
| 235 |
+++ blender-2.64a/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp |
| 236 |
@@ -21,7 +21,7 @@ with SSBA. If not, see <http://www.gnu.o |
| 237 |
|
| 238 |
#if defined(V3DLIB_ENABLE_SUITESPARSE) |
| 239 |
//# include "COLAMD/Include/colamd.h" |
| 240 |
-# include "colamd.h" |
| 241 |
+# include <colamd.h> |
| 242 |
extern "C" |
| 243 |
{ |
| 244 |
//# include "LDL/Include/ldl.h" |
| 245 |
Index: blender-2.64a/intern/dualcon/SConscript |
| 246 |
=================================================================== |
| 247 |
--- blender-2.64a.orig/intern/dualcon/SConscript |
| 248 |
+++ blender-2.64a/intern/dualcon/SConscript |
| 249 |
@@ -3,7 +3,7 @@ Import ('env') |
| 250 |
|
| 251 |
sources = env.Glob('intern/*.cpp') |
| 252 |
|
| 253 |
-incs = '. ../../extern/Eigen3' |
| 254 |
+incs = '. /usr/include/eigen3' |
| 255 |
defs = '' |
| 256 |
|
| 257 |
env.BlenderLib ('bf_intern_dualcon', sources, Split(incs), Split(defs), libtype=['intern'], priority=[100] ) |
| 258 |
Index: blender-2.64a/intern/itasc/SConscript |
| 259 |
=================================================================== |
| 260 |
--- blender-2.64a.orig/intern/itasc/SConscript |
| 261 |
+++ blender-2.64a/intern/itasc/SConscript |
| 262 |
@@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') |
| 263 |
sources += env.Glob('kdl/*.cpp') |
| 264 |
sources += env.Glob('kdl/utilities/*.cpp') |
| 265 |
|
| 266 |
-incs = '. ../../extern/Eigen3' |
| 267 |
+incs = '. /usr/include/eigen3' |
| 268 |
|
| 269 |
defs = [] |
| 270 |
|
| 271 |
Index: blender-2.64a/intern/opennl/SConscript |
| 272 |
=================================================================== |
| 273 |
--- blender-2.64a.orig/intern/opennl/SConscript |
| 274 |
+++ blender-2.64a/intern/opennl/SConscript |
| 275 |
@@ -3,7 +3,7 @@ Import ('env') |
| 276 |
|
| 277 |
sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') |
| 278 |
|
| 279 |
-incs = 'extern superlu ../../extern/colamd/Include' |
| 280 |
+incs = 'extern superlu' |
| 281 |
|
| 282 |
if (env['OURPLATFORM'] in ('win32-mingw', 'win64-mingw')): |
| 283 |
env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] ) |
| 284 |
Index: blender-2.64a/intern/opennl/superlu/get_perm_c.c |
| 285 |
=================================================================== |
| 286 |
--- blender-2.64a.orig/intern/opennl/superlu/get_perm_c.c |
| 287 |
+++ blender-2.64a/intern/opennl/superlu/get_perm_c.c |
| 288 |
@@ -10,7 +10,7 @@ |
| 289 |
*/ |
| 290 |
|
| 291 |
#include "ssp_defs.h" |
| 292 |
-#include "colamd.h" |
| 293 |
+#include <colamd.h> |
| 294 |
|
| 295 |
extern int genmmd_(int *, int *, int *, int *, int *, int *, int *, |
| 296 |
int *, int *, int *, int *, int *); |
| 297 |
Index: blender-2.64a/intern/smoke/SConscript |
| 298 |
=================================================================== |
| 299 |
--- blender-2.64a.orig/intern/smoke/SConscript |
| 300 |
+++ blender-2.64a/intern/smoke/SConscript |
| 301 |
@@ -13,7 +13,7 @@ if env['WITH_BF_OPENMP']: |
| 302 |
defs += ' PARALLEL=1' |
| 303 |
|
| 304 |
incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] |
| 305 |
-incs += ' intern ../../extern/bullet2/src ../memutil ../guardealloc ' |
| 306 |
+incs += ' intern /usr/include/bullet ../memutil ../guardealloc ' |
| 307 |
|
| 308 |
if env['WITH_BF_FFTW3']: |
| 309 |
defs += ' WITH_FFTW3' |
| 310 |
Index: blender-2.64a/source/blender/blenkernel/SConscript |
| 311 |
=================================================================== |
| 312 |
--- blender-2.64a.orig/source/blender/blenkernel/SConscript |
| 313 |
+++ blender-2.64a/source/blender/blenkernel/SConscript |
| 314 |
@@ -13,7 +13,7 @@ incs += ' ../blenlib ../blenfont ../make |
| 315 |
incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' |
| 316 |
incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers' |
| 317 |
incs += ' #/intern/iksolver/extern ../blenloader' |
| 318 |
-incs += ' #/extern/bullet2/src' |
| 319 |
+incs += ' /usr/include/bullet' |
| 320 |
incs += ' #/intern/opennl/extern #/intern/bsp/extern' |
| 321 |
incs += ' ../gpu #/extern/glew/include' |
| 322 |
incs += ' ../bmesh' |
| 323 |
Index: blender-2.64a/source/blender/editors/include/BIF_gl.h |
| 324 |
=================================================================== |
| 325 |
--- blender-2.64a.orig/source/blender/editors/include/BIF_gl.h |
| 326 |
+++ blender-2.64a/source/blender/editors/include/BIF_gl.h |
| 327 |
@@ -33,7 +33,7 @@ |
| 328 |
#ifndef __BIF_GL_H__ |
| 329 |
#define __BIF_GL_H__ |
| 330 |
|
| 331 |
-#include "GL/glew.h" |
| 332 |
+#include <GL/glew.h> |
| 333 |
|
| 334 |
/* |
| 335 |
* these should be phased out. cpack should be replaced in |
| 336 |
Index: blender-2.64a/source/blender/ikplugin/SConscript |
| 337 |
=================================================================== |
| 338 |
--- blender-2.64a.orig/source/blender/ikplugin/SConscript |
| 339 |
+++ blender-2.64a/source/blender/ikplugin/SConscript |
| 340 |
@@ -4,7 +4,7 @@ defs = [] |
| 341 |
sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') |
| 342 |
|
| 343 |
incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib' |
| 344 |
-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen3' |
| 345 |
+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen3' |
| 346 |
|
| 347 |
defs.append('WITH_IK_ITASC') |
| 348 |
defs.append('WITH_IK_SOLVER') |
| 349 |
Index: blender-2.64a/source/gameengine/Converter/SConscript |
| 350 |
=================================================================== |
| 351 |
--- blender-2.64a.orig/source/gameengine/Converter/SConscript |
| 352 |
+++ blender-2.64a/source/gameengine/Converter/SConscript |
| 353 |
@@ -21,7 +21,7 @@ incs += ' #source/blender/windowmanager' |
| 354 |
incs += ' #source/blender/makesrna' |
| 355 |
incs += ' #source/blender/ikplugin' |
| 356 |
incs += ' #extern/recastnavigation/Detour/Include' |
| 357 |
-incs += ' #extern/Eigen3' |
| 358 |
+incs += ' /usr/include/eigen3' |
| 359 |
|
| 360 |
incs += ' ' + env['BF_BULLET_INC'] |
| 361 |
|
| 362 |
Index: blender-2.64a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp |
| 363 |
=================================================================== |
| 364 |
--- blender-2.64a.orig/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp |
| 365 |
+++ blender-2.64a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp |
| 366 |
@@ -2813,7 +2813,8 @@ float CcdPhysicsEnvironment::getApplied |
| 367 |
|
| 368 |
void CcdPhysicsEnvironment::exportFile(const char* filename) |
| 369 |
{ |
| 370 |
- btDefaultSerializer* serializer = new btDefaultSerializer(); |
| 371 |
+ // Workaround bullet-2.77 api change. |
| 372 |
+ btDefaultSerializer* serializer = new btDefaultSerializer(0); |
| 373 |
|
| 374 |
|
| 375 |
for (int i=0;i<m_dynamicsWorld->getNumCollisionObjects();i++) |
Archives