rpms/blender/FC-3 blender-2.37-x86_64.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 blender.spec, 1.5, 1.6 sources, 1.4, 1.5
Toshio Ernie Kuratomi (toshio)
fedora-extras-commits at redhat.com
Tue Jun 7 00:19:51 UTC 2005
- Previous message: common tobuild,1.1138,1.1139
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: toshio
Update of /cvs/extras/rpms/blender/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12895
Modified Files:
.cvsignore blender.spec sources
Added Files:
blender-2.37-x86_64.patch
Log Message:
- Sync against the FC4 package:
+ Update to 2.37.
+ Patch to fix compilation errors on x86_64.
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/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 25 Nov 2004 16:49:43 -0000 1.4
+++ .cvsignore 7 Jun 2005 00:19:49 -0000 1.5
@@ -1 +1 @@
-blender-2.35.tar.bz2
+blender-2.37.tar.gz
Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-3/blender.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blender.spec 25 Nov 2004 16:49:43 -0000 1.5
+++ blender.spec 7 Jun 2005 00:19:49 -0000 1.6
@@ -1,34 +1,36 @@
Name: blender
-Version: 2.35
-Release: 1
-Summary: 3D modeling, animation, rendering and post-production.
+Version: 2.37
+Release: 1.fc3.1
-Group: Applications/Multimedia
+Summary: 3D modeling, animation, rendering and post-production
+
+Group: Applications/Multimedia
License: GPL
URL: http://www.blender.org
-Source0: http://download.blender.org/source/blender-2.35.tar.bz2
+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
+Source3: blender.png
+Source4: blender.desktop
Source5: blender.xml
+Patch0: blender-2.37-x86_64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
-BuildRequires: esound-devel
-BuildRequires: freeglut-devel
-BuildRequires: gettext
-BuildRequires: libjpeg-devel
-BuildRequires: libogg-devel
-BuildRequires: libpng-devel
-BuildRequires: libtool
-BuildRequires: libvorbis-devel
+BuildRequires: esound-devel
+BuildRequires: freeglut-devel
+BuildRequires: gettext
+BuildRequires: libjpeg-devel
+BuildRequires: libogg-devel
+BuildRequires: libpng-devel
+BuildRequires: libtool
+BuildRequires: libvorbis-devel
BuildRequires: openal-devel
BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: scons
-BuildRequires: SDL-devel
-BuildRequires: zlib-devel
+BuildRequires: SDL-devel
+BuildRequires: zlib-devel
Requires(post): desktop-file-utils
Requires(post): shared-mime-info
Requires(postun): desktop-file-utils
@@ -43,8 +45,8 @@
%prep
-%setup -q
-
+%setup -q -n %{name}
+%patch0 -p1 -b .x86_64
%build
sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -61,7 +63,7 @@
install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/blender.png
install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/blender.xml
desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE4}
@@ -71,12 +73,12 @@
%post
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -91,6 +93,11 @@
%changelog
+* Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-1.fc3.1
+- Sync against the FC4 package:
+ + Update to 2.37.
+ + Patch to fix compilation errors on x86_64.
+
* Mon Nov 15 2004 Phillip Compton <pcompton[AT]proteinmedia.com> 2.35-1
- 2.35.
@@ -135,7 +142,7 @@
- enable-international.
* Tue Nov 18 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.30-0.fdr.1
-- Updated to 2.30.
+- Updated to 2.30.
* Fri Oct 10 2003 Phillip Compton <pcompton[AT]proteinmedia.com> 0:2.28-0.fdr.5.c
- Updated to 2.28c.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 25 Nov 2004 16:49:43 -0000 1.4
+++ sources 7 Jun 2005 00:19:49 -0000 1.5
@@ -1 +1 @@
-d451bb3047a9c2fe785c0b91f9769717 blender-2.35.tar.bz2
+a233a77abcc5561fbe2c5fe307654b41 blender-2.37.tar.gz
- Previous message: common tobuild,1.1138,1.1139
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list