[blender/f14] Add third-party patches
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Aug 9 17:33:25 UTC 2011
commit a8ff49a93660f7a5f6861abcf7da6f64f83d69ff
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue Aug 9 18:03:24 2011 +0200
Add third-party patches
blender-2.48-python64.patch | 15 +++++++++++++++
blender-2.48-undefine-operation.patch | 20 ++++++++++++++++++++
blender.spec | 13 +++++++++++--
3 files changed, 46 insertions(+), 2 deletions(-)
---
diff --git a/blender-2.48-python64.patch b/blender-2.48-python64.patch
new file mode 100644
index 0000000..599e49a
--- /dev/null
+++ b/blender-2.48-python64.patch
@@ -0,0 +1,15 @@
+Index: source/gameengine/Expressions/Value.cpp
+===================================================================
+--- source/gameengine/Expressions/Value.cpp.orig 2010-04-18 12:28:37.000000000 +0200
++++ source/gameengine/Expressions/Value.cpp 2010-10-28 14:56:24.000000000 +0200
+@@ -543,8 +543,8 @@ CValue* CValue::ConvertPythonToValue(PyO
+ CListValue* listval = new CListValue();
+ bool error = false;
+
+- int i;
+- int numitems = PyList_Size(pyobj);
++ Py_ssize_t i;
++ Py_ssize_t numitems = PyList_Size(pyobj);
+ for (i=0;i<numitems;i++)
+ {
+ PyObject* listitem = PyList_GetItem(pyobj,i); /* borrowed ref */
diff --git a/blender-2.48-undefine-operation.patch b/blender-2.48-undefine-operation.patch
new file mode 100644
index 0000000..4dc331e
--- /dev/null
+++ b/blender-2.48-undefine-operation.patch
@@ -0,0 +1,20 @@
+Index: release/plugins/sequence/dnr.c
+===================================================================
+--- release/plugins/sequence/dnr.c.orig 2008-11-12 23:16:53.000000000 +0200
++++ release/plugins/sequence/dnr.c 2010-10-28 14:56:30.000000000 +0200
+@@ -110,9 +110,12 @@ static void doit(unsigned char * src_, u
+ unsigned char * dst = dst_;
+
+ while (count--) {
+- *dst = table[(*src++ << 8) | *dst]; dst++;
+- *dst = table[(*src++ << 8) | *dst]; dst++;
+- *dst = table[(*src++ << 8) | *dst]; dst++;
++ *dst = table[(*src++ << 8) | *dst];
++ dst++;
++ *dst = table[(*src++ << 8) | *dst];
++ dst++;
++ *dst = table[(*src++ << 8) | *dst];
++ dst++;
+ *dst++ = *src++;
+ }
+
diff --git a/blender.spec b/blender.spec
index 0148498..04fb6d0 100644
--- a/blender.spec
+++ b/blender.spec
@@ -5,7 +5,7 @@
Name: blender
Version: 2.49b
-Release: 14%{?dist}
+Release: 17%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -26,6 +26,9 @@ Patch1: blender-2.49-scons.patch
Patch2: blender-2.44-bid.patch
Patch3: blender-2.49b-uid.patch
+Patch50: blender-2.48-python64.patch
+Patch51: blender-2.48-undefine-operation.patch
+
Patch100: blender-2.49b-cve.patch
# Taken from Gentoo Linux
Patch101: blender-2.49b-CVE-2009-3850-v4.patch
@@ -106,6 +109,9 @@ Blender Game Engine.
%patch2 -p1 -b .bid
%patch3 -p1 -b .uid
+%patch50 -p0 -b .py64
+%patch51 -p0 -b .undef
+
%patch100 -p1 -b .cve
%patch101 -p1 -b .cvsx
@@ -252,7 +258,10 @@ fi || :
%{_bindir}/blenderplayer.bin
%changelog
-* Mon Jun 20 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.49b-14
+* Tue Aug 9 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.49b-17
+- Add third-party patches
+
+* Mon Jun 20 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.49b-16
- Add patch for CVS-2009-3850 from gentoo (#533395)
* Mon Apr 4 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.49b-13
More information about the scm-commits
mailing list