1 |
lu_zero 11/11/13 12:04:30 |
2 |
|
3 |
Added: blender-2.60-doxyfile.patch |
4 |
blender-2.60a-insecure.desktop |
5 |
blender-2.60a-linux-3.patch |
6 |
blender-2.60-eigen.patch |
7 |
blender-2.60-openjpeg.patch |
8 |
blender-2.60a-enable_site_module.patch |
9 |
blender-2.60-bmake.patch |
10 |
blender-2.60a-CVE-2009-3850-v3.patch |
11 |
blender-desktop.patch blender-2.60-glew.patch |
12 |
blender-2.60a-libav-0.7.patch |
13 |
Log: |
14 |
New version, thanks to Anthoine Bourgeois <anthoine.bourgeois@×××××.com> and everybody who helped on bug #369599 |
15 |
|
16 |
(Portage version: 2.1.10.34/cvs/Linux x86_64) |
17 |
|
18 |
Revision Changes Path |
19 |
1.1 media-gfx/blender/files/blender-2.60-doxyfile.patch |
20 |
|
21 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-doxyfile.patch?rev=1.1&view=markup |
22 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-doxyfile.patch?rev=1.1&content-type=text/plain |
23 |
|
24 |
Index: blender-2.60-doxyfile.patch |
25 |
=================================================================== |
26 |
--- blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:27:33.975642545 -0300 |
27 |
+++ blender-2.58a/doc/doxygen/Doxyfile 2011-07-11 23:28:54.913642574 -0300 |
28 |
@@ -42,7 +42,7 @@ |
29 |
# exceed 55 pixels and the maximum width should not exceed 200 pixels. |
30 |
# Doxygen will copy the logo to the output directory. |
31 |
|
32 |
-PROJECT_LOGO = ../../release/freedesktop/icons/48x48/blender.png |
33 |
+PROJECT_LOGO = ../../release/freedesktop/icons/48x48/apps/blender.png |
34 |
|
35 |
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) |
36 |
# base path where the generated documentation will be put. |
37 |
|
38 |
|
39 |
|
40 |
1.1 media-gfx/blender/files/blender-2.60a-insecure.desktop |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-insecure.desktop?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-insecure.desktop?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: blender-2.60a-insecure.desktop |
46 |
=================================================================== |
47 |
[Desktop Entry] |
48 |
Name=Blender-2.6 (reduced security) |
49 |
GenericName=3D modeller |
50 |
GenericName[es]=modelador 3D |
51 |
GenericName[de]=3D Modellierer |
52 |
GenericName[fr]=modeleur 3D |
53 |
GenericName[ru]=Редактор 3D-моделей |
54 |
Comment=3D modeling, animation, rendering and post-production |
55 |
Comment[es]=modelado 3D, animación, renderizado y post-producción |
56 |
Exec=blender-2.60 --enable-autoexec |
57 |
Icon=blender-2.60 |
58 |
Terminal=false |
59 |
Type=Application |
60 |
Categories=Graphics;3DGraphics; |
61 |
MimeType=application/x-blender; |
62 |
|
63 |
|
64 |
|
65 |
1.1 media-gfx/blender/files/blender-2.60a-linux-3.patch |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-linux-3.patch?rev=1.1&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-linux-3.patch?rev=1.1&content-type=text/plain |
69 |
|
70 |
Index: blender-2.60a-linux-3.patch |
71 |
=================================================================== |
72 |
--- SConstruct 2011-10-29 05:18:43.149564401 +0200 |
73 |
+++ SConstruct 2011-10-29 05:19:37.332887017 +0200 |
74 |
@@ -165,6 +165,9 @@ |
75 |
if crossbuild and platform not in ('win32-vc', 'win64-vc'): |
76 |
platform = 'linuxcross' |
77 |
|
78 |
+if platform == 'linux3': |
79 |
+ platform = 'linux2' # Workaround for Linux 3.x |
80 |
+ |
81 |
env['OURPLATFORM'] = platform |
82 |
|
83 |
configfile = os.path.join("build_files", "scons", "config", platform + "-config.py") |
84 |
|
85 |
|
86 |
|
87 |
1.1 media-gfx/blender/files/blender-2.60-eigen.patch |
88 |
|
89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-eigen.patch?rev=1.1&view=markup |
90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-eigen.patch?rev=1.1&content-type=text/plain |
91 |
|
92 |
Index: blender-2.60-eigen.patch |
93 |
=================================================================== |
94 |
--- intern/itasc/SConscript 2009-09-26 09:14:02.000000000 +0200 |
95 |
+++ intern/itasc/SConscript 2009-09-26 09:14:54.000000000 +0200 |
96 |
@@ -5,7 +5,8 @@ |
97 |
sources += env.Glob('kdl/*.cpp') |
98 |
sources += env.Glob('kdl/utilities/*.cpp') |
99 |
|
100 |
-incs = '. ../../extern/Eigen2' |
101 |
+#incs = '. ../../extern/Eigen2' |
102 |
+incs = '. /usr/include/eigen2' |
103 |
|
104 |
env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] ) |
105 |
|
106 |
--- source/blender/ikplugin/SConscript |
107 |
+++ source/blender/ikplugin/SConscript |
108 |
@@ -4,6 +4,6 @@ |
109 |
sources = env.Glob('intern/*.c') + env.Glob('intern/*.cpp') |
110 |
|
111 |
incs = '#/intern/guardedalloc #/intern/iksolver/extern ../makesdna ../blenlib' |
112 |
-incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc #/extern/Eigen2' |
113 |
+incs += ' ../blenkernel ../include ../ikplugin #/intern/itasc /usr/include/eigen2' |
114 |
|
115 |
env.BlenderLib ( 'bf_ikplugin', sources, Split(incs), [], libtype=['core','player'], priority=[180, 190] ) |
116 |
--- source/gameengine/Converter/SConscript 2009-09-26 09:14:02.000000000 +0200 |
117 |
+++ source/gameengine/Converter/SConscript 2009-09-26 09:14:54.000000000 +0200 |
118 |
@@ -21,7 +21,8 @@ |
119 |
incs += ' #source/blender/makesrna' |
120 |
incs += ' #source/blender/ikplugin' |
121 |
incs += ' #extern/recastnavigation/Detour/Include' |
122 |
-incs += ' #extern/Eigen2' |
123 |
+#incs += ' #extern/Eigen2' |
124 |
+incs += ' /usr/include/eigen2' |
125 |
|
126 |
incs += ' ' + env['BF_BULLET_INC'] |
127 |
|
128 |
--- intern/itasc/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 |
129 |
+++ intern/itasc/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 |
130 |
@@ -25,11 +25,11 @@ |
131 |
# ***** END GPL LICENSE BLOCK ***** |
132 |
|
133 |
set(INC |
134 |
- ../../extern/Eigen2 |
135 |
+ /usr/include/eigen2 |
136 |
) |
137 |
|
138 |
set(INC_SYS |
139 |
- |
140 |
+ /usr/include/eigen2 |
141 |
) |
142 |
|
143 |
set(SRC |
144 |
@@ -117,113 +117,113 @@ set(SRC |
145 |
ublas_types.hpp |
146 |
|
147 |
# until we have another user... |
148 |
- ../../extern/Eigen2/Eigen/src/Array/BooleanRedux.h |
149 |
- ../../extern/Eigen2/Eigen/src/Array/CwiseOperators.h |
150 |
- ../../extern/Eigen2/Eigen/src/Array/Functors.h |
151 |
- ../../extern/Eigen2/Eigen/src/Array/Norms.h |
152 |
- ../../extern/Eigen2/Eigen/src/Array/PartialRedux.h |
153 |
- ../../extern/Eigen2/Eigen/src/Array/Random.h |
154 |
- ../../extern/Eigen2/Eigen/src/Array/Select.h |
155 |
- ../../extern/Eigen2/Eigen/src/Cholesky/LDLT.h |
156 |
- ../../extern/Eigen2/Eigen/src/Cholesky/LLT.h |
157 |
- ../../extern/Eigen2/Eigen/src/Core/Assign.h |
158 |
- ../../extern/Eigen2/Eigen/src/Core/Block.h |
159 |
- ../../extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h |
160 |
- ../../extern/Eigen2/Eigen/src/Core/Coeffs.h |
161 |
- ../../extern/Eigen2/Eigen/src/Core/CommaInitializer.h |
162 |
- ../../extern/Eigen2/Eigen/src/Core/Cwise.h |
163 |
- ../../extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h |
164 |
- ../../extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h |
165 |
- ../../extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h |
166 |
- ../../extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h |
167 |
- ../../extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h |
168 |
- ../../extern/Eigen2/Eigen/src/Core/DiagonalProduct.h |
169 |
- ../../extern/Eigen2/Eigen/src/Core/Dot.h |
170 |
- ../../extern/Eigen2/Eigen/src/Core/Flagged.h |
171 |
- ../../extern/Eigen2/Eigen/src/Core/Functors.h |
172 |
- ../../extern/Eigen2/Eigen/src/Core/Fuzzy.h |
173 |
- ../../extern/Eigen2/Eigen/src/Core/GenericPacketMath.h |
174 |
- ../../extern/Eigen2/Eigen/src/Core/IO.h |
175 |
- ../../extern/Eigen2/Eigen/src/Core/Map.h |
176 |
- ../../extern/Eigen2/Eigen/src/Core/MapBase.h |
177 |
- ../../extern/Eigen2/Eigen/src/Core/MathFunctions.h |
178 |
- ../../extern/Eigen2/Eigen/src/Core/Matrix.h |
179 |
- ../../extern/Eigen2/Eigen/src/Core/MatrixBase.h |
180 |
- ../../extern/Eigen2/Eigen/src/Core/MatrixStorage.h |
181 |
- ../../extern/Eigen2/Eigen/src/Core/Minor.h |
182 |
- ../../extern/Eigen2/Eigen/src/Core/NestByValue.h |
183 |
- ../../extern/Eigen2/Eigen/src/Core/NumTraits.h |
184 |
- ../../extern/Eigen2/Eigen/src/Core/Part.h |
185 |
- ../../extern/Eigen2/Eigen/src/Core/Product.h |
186 |
- ../../extern/Eigen2/Eigen/src/Core/Redux.h |
187 |
- ../../extern/Eigen2/Eigen/src/Core/SolveTriangular.h |
188 |
- ../../extern/Eigen2/Eigen/src/Core/Sum.h |
189 |
- ../../extern/Eigen2/Eigen/src/Core/Swap.h |
190 |
- ../../extern/Eigen2/Eigen/src/Core/Transpose.h |
191 |
- ../../extern/Eigen2/Eigen/src/Core/Visitor.h |
192 |
- ../../extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h |
193 |
- ../../extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h |
194 |
- ../../extern/Eigen2/Eigen/src/Core/util/Constants.h |
195 |
- ../../extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h |
196 |
- ../../extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h |
197 |
- ../../extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h |
198 |
- ../../extern/Eigen2/Eigen/src/Core/util/Macros.h |
199 |
- ../../extern/Eigen2/Eigen/src/Core/util/Memory.h |
200 |
- ../../extern/Eigen2/Eigen/src/Core/util/Meta.h |
201 |
- ../../extern/Eigen2/Eigen/src/Core/util/StaticAssert.h |
202 |
- ../../extern/Eigen2/Eigen/src/Core/util/XprHelper.h |
203 |
- ../../extern/Eigen2/Eigen/src/Geometry/AlignedBox.h |
204 |
- ../../extern/Eigen2/Eigen/src/Geometry/AngleAxis.h |
205 |
- ../../extern/Eigen2/Eigen/src/Geometry/EulerAngles.h |
206 |
- ../../extern/Eigen2/Eigen/src/Geometry/Hyperplane.h |
207 |
- ../../extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h |
208 |
- ../../extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h |
209 |
- ../../extern/Eigen2/Eigen/src/Geometry/Quaternion.h |
210 |
- ../../extern/Eigen2/Eigen/src/Geometry/Rotation2D.h |
211 |
- ../../extern/Eigen2/Eigen/src/Geometry/RotationBase.h |
212 |
- ../../extern/Eigen2/Eigen/src/Geometry/Scaling.h |
213 |
- ../../extern/Eigen2/Eigen/src/Geometry/Transform.h |
214 |
- ../../extern/Eigen2/Eigen/src/Geometry/Translation.h |
215 |
- ../../extern/Eigen2/Eigen/src/LU/Determinant.h |
216 |
- ../../extern/Eigen2/Eigen/src/LU/Inverse.h |
217 |
- ../../extern/Eigen2/Eigen/src/LU/LU.h |
218 |
- ../../extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h |
219 |
- ../../extern/Eigen2/Eigen/src/QR/EigenSolver.h |
220 |
- ../../extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h |
221 |
- ../../extern/Eigen2/Eigen/src/QR/QR.h |
222 |
- ../../extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h |
223 |
- ../../extern/Eigen2/Eigen/src/QR/Tridiagonalization.h |
224 |
- ../../extern/Eigen2/Eigen/src/SVD/SVD.h |
225 |
- ../../extern/Eigen2/Eigen/src/Sparse/AmbiVector.h |
226 |
- ../../extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h |
227 |
- ../../extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h |
228 |
- ../../extern/Eigen2/Eigen/src/Sparse/CoreIterators.h |
229 |
- ../../extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h |
230 |
- ../../extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h |
231 |
- ../../extern/Eigen2/Eigen/src/Sparse/RandomSetter.h |
232 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseAssign.h |
233 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseBlock.h |
234 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwise.h |
235 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h |
236 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h |
237 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h |
238 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseDot.h |
239 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h |
240 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h |
241 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h |
242 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLLT.h |
243 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseLU.h |
244 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h |
245 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h |
246 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseProduct.h |
247 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseRedux.h |
248 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h |
249 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseUtil.h |
250 |
- ../../extern/Eigen2/Eigen/src/Sparse/SparseVector.h |
251 |
- ../../extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h |
252 |
- ../../extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h |
253 |
- ../../extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h |
254 |
- ../../extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h |
255 |
+ /usr/include/eigen2/Eigen/src/Array/BooleanRedux.h |
256 |
+ /usr/include/eigen2/Eigen/src/Array/CwiseOperators.h |
257 |
+ /usr/include/eigen2/Eigen/src/Array/Functors.h |
258 |
+ /usr/include/eigen2/Eigen/src/Array/Norms.h |
259 |
+ /usr/include/eigen2/Eigen/src/Array/PartialRedux.h |
260 |
+ /usr/include/eigen2/Eigen/src/Array/Random.h |
261 |
+ /usr/include/eigen2/Eigen/src/Array/Select.h |
262 |
+ /usr/include/eigen2/Eigen/src/Cholesky/LDLT.h |
263 |
+ /usr/include/eigen2/Eigen/src/Cholesky/LLT.h |
264 |
+ /usr/include/eigen2/Eigen/src/Core/Assign.h |
265 |
+ /usr/include/eigen2/Eigen/src/Core/Block.h |
266 |
+ /usr/include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h |
267 |
+ /usr/include/eigen2/Eigen/src/Core/Coeffs.h |
268 |
+ /usr/include/eigen2/Eigen/src/Core/CommaInitializer.h |
269 |
+ /usr/include/eigen2/Eigen/src/Core/Cwise.h |
270 |
+ /usr/include/eigen2/Eigen/src/Core/CwiseBinaryOp.h |
271 |
+ /usr/include/eigen2/Eigen/src/Core/CwiseNullaryOp.h |
272 |
+ /usr/include/eigen2/Eigen/src/Core/CwiseUnaryOp.h |
273 |
+ /usr/include/eigen2/Eigen/src/Core/DiagonalCoeffs.h |
274 |
+ /usr/include/eigen2/Eigen/src/Core/DiagonalMatrix.h |
275 |
+ /usr/include/eigen2/Eigen/src/Core/DiagonalProduct.h |
276 |
+ /usr/include/eigen2/Eigen/src/Core/Dot.h |
277 |
+ /usr/include/eigen2/Eigen/src/Core/Flagged.h |
278 |
+ /usr/include/eigen2/Eigen/src/Core/Functors.h |
279 |
+ /usr/include/eigen2/Eigen/src/Core/Fuzzy.h |
280 |
+ /usr/include/eigen2/Eigen/src/Core/GenericPacketMath.h |
281 |
+ /usr/include/eigen2/Eigen/src/Core/IO.h |
282 |
+ /usr/include/eigen2/Eigen/src/Core/Map.h |
283 |
+ /usr/include/eigen2/Eigen/src/Core/MapBase.h |
284 |
+ /usr/include/eigen2/Eigen/src/Core/MathFunctions.h |
285 |
+ /usr/include/eigen2/Eigen/src/Core/Matrix.h |
286 |
+ /usr/include/eigen2/Eigen/src/Core/MatrixBase.h |
287 |
+ /usr/include/eigen2/Eigen/src/Core/MatrixStorage.h |
288 |
+ /usr/include/eigen2/Eigen/src/Core/Minor.h |
289 |
+ /usr/include/eigen2/Eigen/src/Core/NestByValue.h |
290 |
+ /usr/include/eigen2/Eigen/src/Core/NumTraits.h |
291 |
+ /usr/include/eigen2/Eigen/src/Core/Part.h |
292 |
+ /usr/include/eigen2/Eigen/src/Core/Product.h |
293 |
+ /usr/include/eigen2/Eigen/src/Core/Redux.h |
294 |
+ /usr/include/eigen2/Eigen/src/Core/SolveTriangular.h |
295 |
+ /usr/include/eigen2/Eigen/src/Core/Sum.h |
296 |
+ /usr/include/eigen2/Eigen/src/Core/Swap.h |
297 |
+ /usr/include/eigen2/Eigen/src/Core/Transpose.h |
298 |
+ /usr/include/eigen2/Eigen/src/Core/Visitor.h |
299 |
+ /usr/include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h |
300 |
+ /usr/include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h |
301 |
+ /usr/include/eigen2/Eigen/src/Core/util/Constants.h |
302 |
+ /usr/include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h |
303 |
+ /usr/include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h |
304 |
+ /usr/include/eigen2/Eigen/src/Core/util/ForwardDeclarations.h |
305 |
+ /usr/include/eigen2/Eigen/src/Core/util/Macros.h |
306 |
+ /usr/include/eigen2/Eigen/src/Core/util/Memory.h |
307 |
+ /usr/include/eigen2/Eigen/src/Core/util/Meta.h |
308 |
+ /usr/include/eigen2/Eigen/src/Core/util/StaticAssert.h |
309 |
+ /usr/include/eigen2/Eigen/src/Core/util/XprHelper.h |
310 |
+ /usr/include/eigen2/Eigen/src/Geometry/AlignedBox.h |
311 |
+ /usr/include/eigen2/Eigen/src/Geometry/AngleAxis.h |
312 |
+ /usr/include/eigen2/Eigen/src/Geometry/EulerAngles.h |
313 |
+ /usr/include/eigen2/Eigen/src/Geometry/Hyperplane.h |
314 |
+ /usr/include/eigen2/Eigen/src/Geometry/OrthoMethods.h |
315 |
+ /usr/include/eigen2/Eigen/src/Geometry/ParametrizedLine.h |
316 |
+ /usr/include/eigen2/Eigen/src/Geometry/Quaternion.h |
317 |
+ /usr/include/eigen2/Eigen/src/Geometry/Rotation2D.h |
318 |
+ /usr/include/eigen2/Eigen/src/Geometry/RotationBase.h |
319 |
+ /usr/include/eigen2/Eigen/src/Geometry/Scaling.h |
320 |
+ /usr/include/eigen2/Eigen/src/Geometry/Transform.h |
321 |
+ /usr/include/eigen2/Eigen/src/Geometry/Translation.h |
322 |
+ /usr/include/eigen2/Eigen/src/LU/Determinant.h |
323 |
+ /usr/include/eigen2/Eigen/src/LU/Inverse.h |
324 |
+ /usr/include/eigen2/Eigen/src/LU/LU.h |
325 |
+ /usr/include/eigen2/Eigen/src/LeastSquares/LeastSquares.h |
326 |
+ /usr/include/eigen2/Eigen/src/QR/EigenSolver.h |
327 |
+ /usr/include/eigen2/Eigen/src/QR/HessenbergDecomposition.h |
328 |
+ /usr/include/eigen2/Eigen/src/QR/QR.h |
329 |
+ /usr/include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h |
330 |
+ /usr/include/eigen2/Eigen/src/QR/Tridiagonalization.h |
331 |
+ /usr/include/eigen2/Eigen/src/SVD/SVD.h |
332 |
+ /usr/include/eigen2/Eigen/src/Sparse/AmbiVector.h |
333 |
+ /usr/include/eigen2/Eigen/src/Sparse/CholmodSupport.h |
334 |
+ /usr/include/eigen2/Eigen/src/Sparse/CompressedStorage.h |
335 |
+ /usr/include/eigen2/Eigen/src/Sparse/CoreIterators.h |
336 |
+ /usr/include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h |
337 |
+ /usr/include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h |
338 |
+ /usr/include/eigen2/Eigen/src/Sparse/RandomSetter.h |
339 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseAssign.h |
340 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseBlock.h |
341 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwise.h |
342 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h |
343 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h |
344 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h |
345 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseDot.h |
346 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseFlagged.h |
347 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h |
348 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLDLT.h |
349 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLLT.h |
350 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseLU.h |
351 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrix.h |
352 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h |
353 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseProduct.h |
354 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseRedux.h |
355 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseTranspose.h |
356 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseUtil.h |
357 |
+ /usr/include/eigen2/Eigen/src/Sparse/SparseVector.h |
358 |
+ /usr/include/eigen2/Eigen/src/Sparse/SuperLUSupport.h |
359 |
+ /usr/include/eigen2/Eigen/src/Sparse/TaucsSupport.h |
360 |
+ /usr/include/eigen2/Eigen/src/Sparse/TriangularSolver.h |
361 |
+ /usr/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h |
362 |
) |
363 |
|
364 |
blender_add_lib(bf_intern_itasc "${SRC}" "${INC}" "${INC_SYS}") |
365 |
--- source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 |
366 |
+++ source/blender/ikplugin/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 |
367 |
@@ -50,7 +50,7 @@ |
368 |
if(WITH_IK_ITASC) |
369 |
add_definitions(-DWITH_IK_ITASC) |
370 |
list(APPEND INC |
371 |
- ../../../extern/Eigen2 |
372 |
+ /usr/include/eigen2 |
373 |
../../../intern/itasc |
374 |
) |
375 |
list(APPEND SRC |
376 |
--- source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:34:31.391907001 +0100 |
377 |
+++ source/gameengine/Converter/CMakeLists.txt 2011-11-10 23:35:17.588906231 +0100 |
378 |
@@ -51,7 +51,7 @@ |
379 |
../../blender/makesrna |
380 |
../../blender/windowmanager |
381 |
../../../extern/bullet2/src |
382 |
- ../../../extern/Eigen2 |
383 |
+ /usr/include/eigen2 |
384 |
../../../intern/container |
385 |
../../../intern/guardedalloc |
386 |
../../../intern/moto/include |
387 |
|
388 |
|
389 |
|
390 |
1.1 media-gfx/blender/files/blender-2.60-openjpeg.patch |
391 |
|
392 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-openjpeg.patch?rev=1.1&view=markup |
393 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-openjpeg.patch?rev=1.1&content-type=text/plain |
394 |
|
395 |
Index: blender-2.60-openjpeg.patch |
396 |
=================================================================== |
397 |
diff -Npur blender-2.60a.orig/extern/libredcode/SConscript blender-2.60a/extern/libredcode/SConscript |
398 |
--- blender-2.60a.orig/extern/libredcode/SConscript 2011-11-09 23:05:16.241465491 +0100 |
399 |
+++ blender-2.60a/extern/libredcode/SConscript 2011-11-09 23:06:24.188464236 +0100 |
400 |
@@ -7,7 +7,8 @@ |
401 |
Import('env') |
402 |
|
403 |
sources = env.Glob('*.c') |
404 |
-incs = '. ../libopenjpeg' |
405 |
+#incs = '. ../libopenjpeg' |
406 |
+incs = '. /usr/include' |
407 |
|
408 |
env.BlenderLib ( libname='extern_redcode', |
409 |
sources=sources, includes=Split(incs), |
410 |
diff -Npur blender-2.60a.orig/extern/SConscript blender-2.60a/extern/SConscript |
411 |
--- blender-2.60a.orig/extern/SConscript 2011-11-09 23:05:16.241465491 +0100 |
412 |
+++ blender-2.60a/extern/SConscript 2011-11-09 23:06:24.188464236 +0100 |
413 |
@@ -11,8 +11,5 @@ |
414 |
if env['WITH_BF_BULLET']: |
415 |
SConscript(['bullet2/src/SConscript']) |
416 |
|
417 |
-if env['WITH_BF_OPENJPEG'] and env['BF_OPENJPEG_LIB'] == '': |
418 |
- SConscript(['libopenjpeg/SConscript']) |
419 |
- |
420 |
if env['WITH_BF_REDCODE'] and env['BF_REDCODE_LIB'] == '': |
421 |
SConscript(['libredcode/SConscript']) |
422 |
diff -Npur blender-2.60a.orig/build_files/scons/tools/Blender.py blender-2.60a/build_files/scons/tools/Blender.py |
423 |
--- blender-2.60a.orig/build_files/scons/tools/Blender.py 2011-11-09 23:05:16.241465491 +0100 |
424 |
+++ blender-2.60a/build_files/scons/tools/Blender.py 2011-11-09 23:06:24.188464236 +0100 |
425 |
@@ -246,6 +246,8 @@ |
426 |
syslibs += Split(lenv['BF_FFMPEG_LIB']) |
427 |
if lenv['WITH_BF_OGG']: |
428 |
syslibs += Split(lenv['BF_OGG_LIB']) |
429 |
+ if lenv['WITH_BF_OPENJPEG']: |
430 |
+ syslibs += Split(lenv['BF_OPENJPEG_LIB']) |
431 |
if lenv['WITH_BF_JACK']: |
432 |
syslibs += Split(lenv['BF_JACK_LIB']) |
433 |
if lenv['WITH_BF_SNDFILE'] and not lenv['WITH_BF_STATICSNDFILE']: |
434 |
|
435 |
|
436 |
|
437 |
1.1 media-gfx/blender/files/blender-2.60a-enable_site_module.patch |
438 |
|
439 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-enable_site_module.patch?rev=1.1&view=markup |
440 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-enable_site_module.patch?rev=1.1&content-type=text/plain |
441 |
|
442 |
Index: blender-2.60a-enable_site_module.patch |
443 |
=================================================================== |
444 |
--- source/blender/python/intern/bpy_interface.c |
445 |
+++ source/blender/python/intern/bpy_interface.c |
446 |
@@ -203,11 +203,6 @@ |
447 |
/* allow to use our own included python */ |
448 |
PyC_SetHomePath(BLI_get_folder(BLENDER_SYSTEM_PYTHON, NULL)); |
449 |
|
450 |
- /* Python 3.2 now looks for '2.58/python/include/python3.2d/pyconfig.h' to parse |
451 |
- * from the 'sysconfig' module which is used by 'site', so for now disable site. |
452 |
- * alternatively we could copy the file. */ |
453 |
- Py_NoSiteFlag= 1; |
454 |
- |
455 |
Py_Initialize(); |
456 |
|
457 |
// PySys_SetArgv(argc, argv); // broken in py3, not a huge deal |
458 |
--- source/gameengine/Ketsji/KX_PythonInit.cpp |
459 |
+++ source/gameengine/Ketsji/KX_PythonInit.cpp |
460 |
@@ -1825,7 +1825,6 @@ |
461 |
STR_String pname = progname; |
462 |
Py_SetProgramName(pname.Ptr()); |
463 |
#endif |
464 |
- Py_NoSiteFlag=1; |
465 |
Py_FrozenFlag=1; |
466 |
|
467 |
/* must run before python initializes */ |
468 |
@@ -1898,7 +1897,6 @@ |
469 |
STR_String pname = progname; |
470 |
Py_SetProgramName(pname.Ptr()); |
471 |
#endif |
472 |
- Py_NoSiteFlag=1; |
473 |
Py_FrozenFlag=1; |
474 |
|
475 |
initPyTypes(); |
476 |
|
477 |
|
478 |
|
479 |
1.1 media-gfx/blender/files/blender-2.60-bmake.patch |
480 |
|
481 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-bmake.patch?rev=1.1&view=markup |
482 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-bmake.patch?rev=1.1&content-type=text/plain |
483 |
|
484 |
Index: blender-2.60-bmake.patch |
485 |
=================================================================== |
486 |
diff -Npur release/plugins.orig/bmake release/plugins/bmake |
487 |
--- release/plugins.orig/bmake 2011-11-11 15:00:26.339924887 +0100 |
488 |
+++ release/plugins/bmake 2011-11-11 15:01:40.637923565 +0100 |
489 |
@@ -57,10 +57,10 @@ |
490 |
LDFLAGS="-Bshareable"; |
491 |
elif ( test $UNAME = "Linux" ) then |
492 |
CC="gcc"; |
493 |
- CFLAGS="-fPIC -funsigned-char -O2"; |
494 |
+# CFLAGS="-fPIC -funsigned-char -O2"; |
495 |
|
496 |
LD="ld"; |
497 |
- LDFLAGS="-Bshareable"; |
498 |
+# LDFLAGS="-Bshareable"; |
499 |
elif ( test $UNAME = "SunOS" ) then |
500 |
CC="cc"; |
501 |
CFLAGS="-O"; |
502 |
@@ -109,22 +109,20 @@ elif ( test -f "../plugin.h" ) then |
503 |
INCLUDES=-I..; |
504 |
elif ( test -f "../include/plugin.h" ) then |
505 |
INCLUDES=-I../include |
506 |
+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then |
507 |
+ INCLUDES=-I../../../source/blender/blenpluginapi |
508 |
else |
509 |
echo "Couldn't find plugin.h"; |
510 |
exit; |
511 |
fi |
512 |
|
513 |
LIBM=`fgrep "#include <math.h>" $CFILE` |
514 |
-LIBC=`fgrep "#include <std" $CFILE` |
515 |
|
516 |
-LIBS= |
517 |
+LIBS="-lc" |
518 |
|
519 |
if ( test -n "$LIBM" ) then |
520 |
LIBS="$LIBS -lm"; |
521 |
fi |
522 |
-if ( test -n "$LIBC" ) then |
523 |
- LIBS="$LIBS -lc"; |
524 |
-fi |
525 |
|
526 |
echo "$CC $CFLAGS -c $CFILE $INCLUDES" |
527 |
$CC $CFLAGS -c $CFILE $INCLUDES |
528 |
diff -Npur release/plugins.orig/sequence/color-correction-hsv.c release/plugins/sequence/color-correction-hsv.c |
529 |
--- release/plugins.orig/sequence/color-correction-hsv.c 2011-11-11 15:00:26.339924887 +0100 |
530 |
+++ release/plugins/sequence/color-correction-hsv.c 2011-11-11 15:03:47.233921332 +0100 |
531 |
@@ -15,7 +15,7 @@ |
532 |
* |
533 |
*/ |
534 |
|
535 |
-#include "math.h" |
536 |
+#include <math.h> |
537 |
#include "plugin.h" |
538 |
#include <stdio.h> |
539 |
|
540 |
diff -Npur release/plugins.orig/sequence/color-correction-yuv.c release/plugins/sequence/color-correction-yuv.c |
541 |
--- release/plugins.orig/sequence/color-correction-yuv.c 2011-11-11 15:00:26.339924887 +0100 |
542 |
+++ release/plugins/sequence/color-correction-yuv.c 2011-11-11 15:02:10.446923031 +0100 |
543 |
@@ -15,7 +15,7 @@ |
544 |
* |
545 |
*/ |
546 |
|
547 |
-#include "math.h" |
548 |
+#include <math.h> |
549 |
#include "plugin.h" |
550 |
#include <stdio.h> |
551 |
|
552 |
diff -Npur release/plugins.orig/sequence/dnr.c release/plugins/sequence/dnr.c |
553 |
--- release/plugins.orig/sequence/dnr.c 2011-11-11 15:00:26.339924887 +0100 |
554 |
+++ release/plugins/sequence/dnr.c 2011-11-11 15:03:30.049921648 +0100 |
555 |
@@ -15,7 +15,7 @@ |
556 |
* |
557 |
*/ |
558 |
|
559 |
-#include "math.h" |
560 |
+#include <math.h> |
561 |
#include "plugin.h" |
562 |
#include <stdio.h> |
563 |
|
564 |
diff -Npur release/plugins.orig/sequence/gamma.c release/plugins/sequence/gamma.c |
565 |
--- release/plugins.orig/sequence/gamma.c 2011-11-11 15:00:26.339924887 +0100 |
566 |
+++ release/plugins/sequence/gamma.c 2011-11-11 15:01:58.982923268 +0100 |
567 |
@@ -15,7 +15,7 @@ |
568 |
* |
569 |
*/ |
570 |
|
571 |
-#include "math.h" |
572 |
+#include <math.h> |
573 |
#include "plugin.h" |
574 |
#include "util.h" |
575 |
#include <stdio.h> |
576 |
diff -Npur release/plugins.orig/texture/clouds2.c release/plugins/texture/clouds2.c |
577 |
--- release/plugins.orig/texture/clouds2.c 2011-11-11 15:00:26.339924887 +0100 |
578 |
+++ release/plugins/texture/clouds2.c 2011-11-11 15:02:23.104922789 +0100 |
579 |
@@ -27,7 +27,7 @@ |
580 |
* ***** END GPL LICENSE BLOCK ***** |
581 |
*/ |
582 |
|
583 |
-#include "math.h" |
584 |
+#include <math.h> |
585 |
#include "plugin.h" |
586 |
|
587 |
/* ******************** GLOBAL VARIABLES ***************** */ |
588 |
diff -Npur release/plugins.orig/texture/tiles.c release/plugins/texture/tiles.c |
589 |
--- release/plugins.orig/texture/tiles.c 2011-11-11 15:00:26.339924887 +0100 |
590 |
+++ release/plugins/texture/tiles.c 2011-11-11 15:04:05.749921038 +0100 |
591 |
@@ -27,7 +27,7 @@ |
592 |
* ***** END GPL LICENSE BLOCK ***** |
593 |
*/ |
594 |
|
595 |
-#include "math.h" |
596 |
+#include <math.h> |
597 |
#include "plugin.h" |
598 |
|
599 |
/* ******************** GLOBAL VARIABLES ***************** */ |
600 |
|
601 |
|
602 |
|
603 |
1.1 media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch |
604 |
|
605 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch?rev=1.1&view=markup |
606 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-CVE-2009-3850-v3.patch?rev=1.1&content-type=text/plain |
607 |
|
608 |
Index: blender-2.60a-CVE-2009-3850-v3.patch |
609 |
=================================================================== |
610 |
diff -Npur blender-2.60a.orig/source/blender/blenkernel/intern/blender.c blender-2.60a/source/blender/blenkernel/intern/blender.c |
611 |
--- blender-2.60a.orig/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:11.905602401 +0100 |
612 |
+++ blender-2.60a/source/blender/blenkernel/intern/blender.c 2011-11-09 20:56:42.827601857 +0100 |
613 |
@@ -145,6 +145,7 @@ void initglobals(void) |
614 |
G.f |= G_SCRIPT_AUTOEXEC; |
615 |
#else |
616 |
G.f &= ~G_SCRIPT_AUTOEXEC; |
617 |
+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ |
618 |
#endif |
619 |
} |
620 |
|
621 |
diff -Npur blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c blender-2.60a/source/blender/makesrna/intern/rna_userdef.c |
622 |
--- blender-2.60a.orig/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 20:56:12.003602399 +0100 |
623 |
+++ blender-2.60a/source/blender/makesrna/intern/rna_userdef.c 2011-11-09 21:02:43.204595484 +0100 |
624 |
@@ -116,9 +116,17 @@ static void rna_userdef_show_manipulator |
625 |
|
626 |
static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) |
627 |
{ |
628 |
- UserDef *userdef = (UserDef*)ptr->data; |
629 |
- if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; |
630 |
- else G.f |= G_SCRIPT_AUTOEXEC; |
631 |
+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { |
632 |
+ /* Blender run with --enable-autoexec */ |
633 |
+ UserDef *userdef = (UserDef*)ptr->data; |
634 |
+ if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; |
635 |
+ else G.f |= G_SCRIPT_AUTOEXEC; |
636 |
+ } |
637 |
+} |
638 |
+ |
639 |
+static int rna_userdef_script_autoexec_editable(Main *bmain, Scene *scene, PointerRNA *ptr) { |
640 |
+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ |
641 |
+ return !(G.f & G_SCRIPT_OVERRIDE_PREF); |
642 |
} |
643 |
|
644 |
static void rna_userdef_mipmap_update(Main *bmain, Scene *scene, PointerRNA *ptr) |
645 |
@@ -2630,6 +2638,8 @@ static void rna_def_userdef_system(Blend |
646 |
"Allow any .blend file to run scripts automatically " |
647 |
"(unsafe with blend files from an untrusted source)"); |
648 |
RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); |
649 |
+ /* Disable "Auto Run Python Scripts" checkbox unless Blender run with --enable-autoexec */ |
650 |
+ RNA_def_property_editable_func(prop, "rna_userdef_script_autoexec_editable"); |
651 |
|
652 |
prop= RNA_def_property(srna, "use_tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); |
653 |
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE); |
654 |
diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c blender-2.60a/source/blender/windowmanager/intern/wm_files.c |
655 |
--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_files.c 2011-11-09 20:56:12.458602413 +0100 |
656 |
+++ blender-2.60a/source/blender/windowmanager/intern/wm_files.c 2011-11-09 21:05:16.768592770 +0100 |
657 |
@@ -285,12 +285,17 @@ static void wm_init_userdef(bContext *C) |
658 |
|
659 |
/* set the python auto-execute setting from user prefs */ |
660 |
/* enabled by default, unless explicitly enabled in the command line which overrides */ |
661 |
- if((G.f & G_SCRIPT_OVERRIDE_PREF) == 0) { |
662 |
+ if (! G.background && ((G.f & G_SCRIPT_OVERRIDE_PREF) == 0)) { |
663 |
+ /* Blender run with --enable-autoexec */ |
664 |
if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |= G_SCRIPT_AUTOEXEC; |
665 |
else G.f &= ~G_SCRIPT_AUTOEXEC; |
666 |
} |
667 |
/* update tempdir from user preferences */ |
668 |
BLI_where_is_temp(btempdir, FILE_MAX, 1); |
669 |
+ |
670 |
+ /* Workaround to fix default of "Auto Run Python Scripts" checkbox */ |
671 |
+ if ((G.f & G_SCRIPT_OVERRIDE_PREF) && !(G.f & G_SCRIPT_AUTOEXEC)) |
672 |
+ U.flag |= USER_SCRIPT_AUTOEXEC_DISABLE; |
673 |
} |
674 |
|
675 |
|
676 |
diff -Npur blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c blender-2.60a/source/blender/windowmanager/intern/wm_operators.c |
677 |
--- blender-2.60a.orig/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 20:56:12.458602413 +0100 |
678 |
+++ blender-2.60a/source/blender/windowmanager/intern/wm_operators.c 2011-11-09 21:07:09.746590772 +0100 |
679 |
@@ -1583,12 +1583,13 @@ static int wm_open_mainfile_exec(bContex |
680 |
G.fileflags &= ~G_FILE_NO_UI; |
681 |
else |
682 |
G.fileflags |= G_FILE_NO_UI; |
683 |
- |
684 |
- if(RNA_boolean_get(op->ptr, "use_scripts")) |
685 |
+ |
686 |
+ /* Restrict "Trusted Source" mode to Blender in --enable-autoexec mode */ |
687 |
+ if(RNA_boolean_get(op->ptr, "use_scripts") && (!(G.f & G_SCRIPT_OVERRIDE_PREF))) |
688 |
G.f |= G_SCRIPT_AUTOEXEC; |
689 |
else |
690 |
G.f &= ~G_SCRIPT_AUTOEXEC; |
691 |
- |
692 |
+ |
693 |
// XXX wm in context is not set correctly after WM_read_file -> crash |
694 |
// do it before for now, but is this correct with multiple windows? |
695 |
WM_event_add_notifier(C, NC_WINDOW, NULL); |
696 |
@@ -1600,6 +1601,8 @@ static int wm_open_mainfile_exec(bContex |
697 |
|
698 |
static void WM_OT_open_mainfile(wmOperatorType *ot) |
699 |
{ |
700 |
+ PropertyRNA * use_scripts_checkbox = NULL; |
701 |
+ |
702 |
ot->name= "Open Blender File"; |
703 |
ot->idname= "WM_OT_open_mainfile"; |
704 |
ot->description="Open a Blender file"; |
705 |
@@ -1611,7 +1614,12 @@ static void WM_OT_open_mainfile(wmOperat |
706 |
WM_operator_properties_filesel(ot, FOLDERFILE|BLENDERFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH); |
707 |
|
708 |
RNA_def_boolean(ot->srna, "load_ui", 1, "Load UI", "Load user interface setup in the .blend file"); |
709 |
- RNA_def_boolean(ot->srna, "use_scripts", 1, "Trusted Source", "Allow blend file execute scripts automatically, default available from system preferences"); |
710 |
+ use_scripts_checkbox = RNA_def_boolean(ot->srna, "use_scripts", |
711 |
+ !!(G.f & G_SCRIPT_AUTOEXEC), "Trusted Source", |
712 |
+ "Allow blend file execute scripts automatically, default available from system preferences"); |
713 |
+ /* Disable "Trusted Source" checkbox unless Blender run with --enable-autoexec */ |
714 |
+ if (use_scripts_checkbox && (G.f & G_SCRIPT_OVERRIDE_PREF)) |
715 |
+ RNA_def_property_clear_flag(use_scripts_checkbox, PROP_EDITABLE); |
716 |
} |
717 |
|
718 |
/* **************** link/append *************** */ |
719 |
diff -Npur blender-2.60a.orig/source/creator/creator.c blender-2.60a/source/creator/creator.c |
720 |
--- blender-2.60a.orig/source/creator/creator.c 2011-11-09 20:56:11.899602401 +0100 |
721 |
+++ blender-2.60a/source/creator/creator.c 2011-11-09 21:17:22.278579932 +0100 |
722 |
@@ -258,6 +258,7 @@ static int print_help(int UNUSED(argc), |
723 |
|
724 |
printf("\n"); |
725 |
|
726 |
+ BLI_argsPrintArgDoc(ba, "-666"); |
727 |
BLI_argsPrintArgDoc(ba, "--enable-autoexec"); |
728 |
BLI_argsPrintArgDoc(ba, "--disable-autoexec"); |
729 |
|
730 |
@@ -326,14 +327,14 @@ static int end_arguments(int UNUSED(argc |
731 |
static int enable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) |
732 |
{ |
733 |
G.f |= G_SCRIPT_AUTOEXEC; |
734 |
- G.f |= G_SCRIPT_OVERRIDE_PREF; |
735 |
+ G.f &= ~G_SCRIPT_OVERRIDE_PREF; /* Enables turning G_SCRIPT_AUTOEXEC off from user prefs */ |
736 |
return 0; |
737 |
} |
738 |
|
739 |
static int disable_python(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data)) |
740 |
{ |
741 |
G.f &= ~G_SCRIPT_AUTOEXEC; |
742 |
- G.f |= G_SCRIPT_OVERRIDE_PREF; |
743 |
+ G.f |= G_SCRIPT_OVERRIDE_PREF; /* Disables turning G_SCRIPT_AUTOEXEC on from user prefs */ |
744 |
return 0; |
745 |
} |
746 |
|
747 |
@@ -1055,8 +1056,9 @@ static void setupArguments(bContext *C, |
748 |
# define PY_DISABLE_AUTO ", (compiled as non-standard default)" |
749 |
#endif |
750 |
|
751 |
- BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL); |
752 |
- BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL); |
753 |
+ 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); |
754 |
+ BLI_argsAdd(ba, 1, "-y", "--enable-autoexec", "\n\tEnable automatic python script execution" PY_ENABLE_AUTO, enable_python, NULL); |
755 |
+ BLI_argsAdd(ba, 1, "-Y", "--disable-autoexec", "\n\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)" PY_DISABLE_AUTO, disable_python, NULL); |
756 |
|
757 |
#undef PY_ENABLE_AUTO |
758 |
#undef PY_DISABLE_AUTO |
759 |
|
760 |
|
761 |
|
762 |
1.1 media-gfx/blender/files/blender-desktop.patch |
763 |
|
764 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-desktop.patch?rev=1.1&view=markup |
765 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-desktop.patch?rev=1.1&content-type=text/plain |
766 |
|
767 |
Index: blender-desktop.patch |
768 |
=================================================================== |
769 |
--- release/freedesktop/blender.desktop 2010-09-12 00:05:51.000000000 -0700 |
770 |
+++ release/freedesktop/blender.desktop 2010-09-12 00:07:32.000000000 -0700 |
771 |
@@ -1,5 +1,5 @@ |
772 |
[Desktop Entry] |
773 |
-Name=Blender |
774 |
+Name=Blender-2.6 |
775 |
GenericName=3D modeller |
776 |
GenericName[es]=modelador 3D |
777 |
GenericName[de]=3D Modellierer |
778 |
@@ -7,8 +7,8 @@ |
779 |
GenericName[ru]=Редактор 3D-моделей |
780 |
Comment=3D modeling, animation, rendering and post-production |
781 |
Comment[es]=modelado 3D, animación, renderizado y post-producción |
782 |
-Exec=blender |
783 |
-Icon=blender |
784 |
+Exec=blender-2.60 |
785 |
+Icon=blender-2.60 |
786 |
Terminal=false |
787 |
Type=Application |
788 |
Categories=Graphics;3DGraphics; |
789 |
|
790 |
|
791 |
|
792 |
1.1 media-gfx/blender/files/blender-2.60-glew.patch |
793 |
|
794 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-glew.patch?rev=1.1&view=markup |
795 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60-glew.patch?rev=1.1&content-type=text/plain |
796 |
|
797 |
Index: blender-2.60-glew.patch |
798 |
=================================================================== |
799 |
--- extern/SConscript |
800 |
+++ extern/SConscript |
801 |
@@ -2,8 +2,6 @@ |
802 |
|
803 |
Import('env') |
804 |
|
805 |
-SConscript(['glew/SConscript']) |
806 |
- |
807 |
if env['WITH_BF_GAMEENGINE']: |
808 |
SConscript(['recastnavigation/SConscript']) |
809 |
|
810 |
if env['WITH_BF_ELTOPO']: |
811 |
SConscript(['eltopo/SConscript']) |
812 |
|
813 |
--- source/blender/editors/include/BIF_gl.h |
814 |
+++ source/blender/editors/include/BIF_gl.h |
815 |
@@ -35,7 +35,7 @@ |
816 |
#ifndef BIF_GL_H |
817 |
#define BIF_GL_H |
818 |
|
819 |
-#include "GL/glew.h" |
820 |
+#include <GL/glew.h> |
821 |
|
822 |
/* |
823 |
* these should be phased out. cpack should be replaced in |
824 |
--- extern/CMakeLists.txt |
825 |
+++ extern/CMakeLists.txt |
826 |
@@ -39,9 +39,6 @@ |
827 |
add_subdirectory(binreloc) |
828 |
endif() |
829 |
|
830 |
-if(WITH_BUILTIN_GLEW) |
831 |
- add_subdirectory(glew) |
832 |
-endif() |
833 |
|
834 |
if(WITH_GAMEENGINE) |
835 |
add_subdirectory(recastnavigation) |
836 |
--- CMakeLists.txt |
837 |
+++ CMakeLists.txt |
838 |
@@ -150,7 +150,7 @@ |
839 |
|
840 |
if(UNIX AND NOT APPLE) |
841 |
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON) |
842 |
- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) |
843 |
+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF) |
844 |
else() |
845 |
# not an option for other OS's |
846 |
set(WITH_BUILTIN_GLEW ON) |
847 |
|
848 |
|
849 |
|
850 |
1.1 media-gfx/blender/files/blender-2.60a-libav-0.7.patch |
851 |
|
852 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-libav-0.7.patch?rev=1.1&view=markup |
853 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/files/blender-2.60a-libav-0.7.patch?rev=1.1&content-type=text/plain |
854 |
|
855 |
Index: blender-2.60a-libav-0.7.patch |
856 |
=================================================================== |
857 |
--- blender-2.60a.orig/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-10-24 20:09:01.000000000 +0200 |
858 |
+++ blender-2.60a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp 2011-11-13 12:34:01.000000000 +0100 |
859 |
@@ -40,6 +40,7 @@ |
860 |
#include <libavcodec/avcodec.h> |
861 |
#include <libavformat/avformat.h> |
862 |
#include <libavformat/avio.h> |
863 |
+#include <libavutil/mathematics.h> |
864 |
#include "ffmpeg_compat.h" |
865 |
} |
866 |
|
867 |
@@ -57,10 +58,14 @@ |
868 |
{ |
869 |
static const char* formats[] = { NULL, "ac3", "flac", "matroska", "mp2", "mp3", "ogg", "wav" }; |
870 |
|
871 |
- if(avformat_alloc_output_context2(&m_formatCtx, NULL, formats[format], filename.c_str())) |
872 |
- AUD_THROW(AUD_ERROR_FFMPEG, context_error); |
873 |
+ m_formatCtx = avformat_alloc_context(); |
874 |
+ if (!m_formatCtx) AUD_THROW(AUD_ERROR_FFMPEG, context_error); |
875 |
|
876 |
- m_outputFmt = m_formatCtx->oformat; |
877 |
+ m_outputFmt = m_formatCtx->oformat = av_guess_format(formats[format], filename.c_str(), NULL); |
878 |
+ if (!m_outputFmt) { |
879 |
+ avformat_free_context(m_formatCtx); |
880 |
+ AUD_THROW(AUD_ERROR_FFMPEG, context_error); |
881 |
+ } |
882 |
|
883 |
switch(codec) |
884 |
{ |