rpms/blender/devel blender-2.37-x86_64.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 blender.spec, 1.11, 1.12 sources, 1.5, 1.6 blender-2.36-gcc4.patch, 1.1, NONE

Tue Jun 7 00:23:00 UTC 2005

Author: toshio

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

Modified Files:
	.cvsignore blender.spec sources 
Added Files:
	blender-2.37-x86_64.patch 
Removed Files:
	blender-2.36-gcc4.patch 
Log Message:
* Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
- Bump release for development.
  
* Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2
- Patch to fix compilation errors on x86_64.
  
* Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-1
- Update to 2.37.
- Drop gcc4 patch.


blender-2.37-x86_64.patch:

--- NEW FILE blender-2.37-x86_64.patch ---
--- blender/source/gameengine/Expressions/KX_HashedPtr.cpp.x86_64	2004-03-22 17:01:28.000000000 -0500
+++ blender/source/gameengine/Expressions/KX_HashedPtr.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -57,5 +57,5 @@
 
 unsigned int CHashedPtr::hash() const
 {
-	return KX_Hash((unsigned int) m_valptr);
+	return KX_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));
 }
--- blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp.x86_64	2005-03-09 14:45:59.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_WorldIpoController.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -92,10 +92,10 @@
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		int orgbase = (int)this;
-		int orgloc = (int)scaal;
-		int offset = orgloc-orgbase;
-		int newaddrbase = (int)iporeplica + offset;
+		long orgbase = (long)this;
+		long orgloc = (long)scaal;
+		long offset = orgloc-orgbase;
+		long newaddrbase = (long)iporeplica + offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
 	}
--- blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp.x86_64	2004-03-22 17:01:52.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -87,10 +87,10 @@
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		int orgbase = (int)this;
-		int orgloc = (int)scaal;
-		int offset = orgloc-orgbase;
-		int newaddrbase = (int)iporeplica + offset;
+		long orgbase = (long)this;
+		long orgloc = (long)scaal;
+		long offset = orgloc-orgbase;
+		long newaddrbase = (long)iporeplica + offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
 	}
--- blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp.x86_64	2004-03-22 17:01:52.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_LightIpoSGController.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -97,10 +97,10 @@
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		int orgbase = (int)this;
-		int orgloc = (int)scaal;
-		int offset = orgloc-orgbase;
-		int newaddrbase = (int)iporeplica + offset;
+		long orgbase = (long)this;
+		long orgloc = (long)scaal;
+		long offset = orgloc-orgbase;
+		long newaddrbase = (long)iporeplica + offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
 	}
--- blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp.x86_64	2005-03-25 05:33:37.000000000 -0500
+++ blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -168,10 +168,10 @@
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		int orgbase = (int)&m_ipo_xform;
-		int orgloc = (int)scaal;
-		int offset = orgloc-orgbase;
-		int newaddrbase = (int)&iporeplica->m_ipo_xform;
+		long orgbase = (long)&m_ipo_xform;
+		long orgloc = (long)scaal;
+		long offset = orgloc-orgbase;
+		long newaddrbase = (long)&iporeplica->m_ipo_xform;
 		newaddrbase += offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
--- blender/source/gameengine/Ketsji/KX_GameObject.cpp.x86_64	2005-04-18 07:44:21.000000000 -0400
+++ blender/source/gameengine/Ketsji/KX_GameObject.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -1069,10 +1069,10 @@
 											   PyObject* kwds)
 {
 	KX_IPhysicsController* ctrl = GetPhysicsController();
-	int physid=0;
+	long physid=0;
 	if (ctrl)
 	{
-		physid= (int)ctrl->GetUserData();
+		physid= (long)ctrl->GetUserData();
 	}
 	return PyInt_FromLong(physid);
 }
--- blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp.x86_64	2004-07-21 20:26:34.000000000 -0400
+++ blender/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp	2005-06-05 10:09:48.000000000 -0400
@@ -92,10 +92,10 @@
 		iporeplica->AddInterpolator(copyipo);
 
 		MT_Scalar* scaal = ((KX_ScalarInterpolator*)*i)->GetTarget();
-		int orgbase = (int)this;
-		int orgloc = (int)scaal;
-		int offset = orgloc-orgbase;
-		int newaddrbase = (int)iporeplica + offset;
+		long orgbase = (long)this;
+		long orgloc = (long)scaal;
+		long offset = orgloc-orgbase;
+		long newaddrbase = (long)iporeplica + offset;
 		MT_Scalar* blaptr = (MT_Scalar*) newaddrbase;
 		copyipo->SetNewTarget((MT_Scalar*)blaptr);
 	}
--- blender/source/kernel/gen_system/GEN_HashedPtr.h.x86_64	2002-12-27 08:11:00.000000000 -0500
+++ blender/source/kernel/gen_system/GEN_HashedPtr.h	2005-06-05 10:09:48.000000000 -0400
@@ -40,7 +40,7 @@
 	void* m_valptr;
 public:
 	GEN_HashedPtr(void* val) : m_valptr(val) {};
-	unsigned int hash() const { return GEN_Hash((unsigned int) m_valptr);};
+	unsigned int hash() const { return GEN_Hash((unsigned int)((unsigned long) m_valptr & 0x00000000FFFFFFFF));};
 	inline friend bool operator ==(const GEN_HashedPtr & rhs, const GEN_HashedPtr & lhs) { return rhs.m_valptr == lhs.m_valptr;};
 };
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 May 2005 21:29:19 -0000	1.5
+++ .cvsignore	7 Jun 2005 00:22:58 -0000	1.6
@@ -1 +1 @@
-blender-2.36.tar.gz
+blender-2.37.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- blender.spec	16 May 2005 21:07:15 -0000	1.11
+++ blender.spec	7 Jun 2005 00:22:58 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           blender
-Version:        2.36
+Version:        2.37
 Release:        3
 
 Summary:        3D modeling, animation, rendering and post-production
@@ -7,13 +7,13 @@
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
-Source0:        http://download.blender.org/source/blender-2.36.tar.gz
+Source0:        http://download.blender.org/source/blender-2.37.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:        blender.png
 Source4:        blender.desktop
 Source5:        blender.xml
-Patch0:		blender-2.36-gcc4.patch
+Patch0:		blender-2.37-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -46,7 +46,7 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .x86_64
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +93,16 @@
 
 
 %changelog
+* Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
+- Bump release for development.
+  
+* Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2
+- Patch to fix compilation errors on x86_64.
+  
+* Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-1
+- Update to 2.37.
+- Drop gcc4 patch.
+  
 * Mon May 16 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.36-3
 - Bump and rebuild now that scons is available on all platforms.
   


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 May 2005 21:29:19 -0000	1.5
+++ sources	7 Jun 2005 00:22:58 -0000	1.6
@@ -1 +1 @@
-8e2237c86b12e6061935632495aec875  blender-2.36.tar.gz
+a233a77abcc5561fbe2c5fe307654b41  blender-2.37.tar.gz


--- blender-2.36-gcc4.patch DELETED ---


