rpms/blender/devel blender-2.42a-x64.patch, NONE, 1.1 blender.spec, 1.38, 1.39

[Jochen Schmitt (s4504kr)]

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32458

Modified Files:
	blender.spec 
Added Files:
	blender-2.42a-x64.patch 
Log Message:
Try patch to solve x64-problem

blender-2.42a-x64.patch:

--- NEW FILE blender-2.42a-x64.patch ---
--- source/gameengine/Expressions/ListValue.cpp~	2006-12-12 09:49:00.000000000 -0800
+++ source/gameengine/Expressions/ListValue.cpp	2006-12-12 09:50:57.000000000 -0800
@@ -23,12 +23,12 @@
 #include <config.h>
 #endif
 
-int listvalue_bufferlen(PyObject* list)
+Py_ssize_t listvalue_bufferlen(PyObject* list)
 {
 	return ( ((CListValue*)list)->GetCount());
 }
 
-PyObject* listvalue_buffer_item(PyObject* list,int index)
+PyObject* listvalue_buffer_item(PyObject* list,Py_ssize_t index)
 {
 	if (index >= 0 && index < ((CListValue*) list)->GetCount())
 	{
@@ -68,7 +68,7 @@
 
 
 /* just slice it into a python list... */
-PyObject* listvalue_buffer_slice(PyObject* list,int ilow, int ihigh)
+PyObject* listvalue_buffer_slice(PyObject* list,Py_ssize_t ilow, Py_ssize_t ihigh)
 {
 	int i, j;
 	PyListObject *newlist;


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- blender.spec	12 Dec 2006 16:47:43 -0000	1.38
+++ blender.spec	12 Dec 2006 18:27:29 -0000	1.39
@@ -3,7 +3,7 @@
 
 Name:           blender
 Version:        2.42a
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -20,6 +20,7 @@
 Source7:	blender-2.42.config
 
 Patch1:         blender-2.42-scons.patch
+Patch2:		blender-2.42a-x65.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,8 +47,6 @@
 buildRequires:  freetype-devel
 BuildRequires:  OpenEXR-devel
 
-ExcludeArch: x86_64
-
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -63,6 +62,7 @@
 %prep
 %setup -q 
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp %{SOURCE7} user-config.py
@@ -162,6 +162,9 @@
 %{_datadir}/mime/packages/blender.xml
 
 %changelog
+* Tue Dec 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-11
+- Try x64-patch for complle with python-2.5
+
 * Tue Dec 12 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.42a-10
 - Exclude x86_64 arch (#219329)