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-2.50-uninit-var.patch b/blender-2.50-uninit-var.patch
new file mode 100644
index 0000000..73bc315
--- /dev/null
+++ b/blender-2.50-uninit-var.patch
@@ -0,0 +1,28 @@
+Index: extern/bullet2/src/LinearMath/btVector3.h
+===================================================================
+--- extern/bullet2/src/LinearMath/btVector3.h.orig	2009-03-17 23:44:58.000000000 +0200
++++ extern/bullet2/src/LinearMath/btVector3.h	2010-10-28 14:56:38.000000000 +0200
+@@ -63,7 +63,8 @@ public:
+ 	public:
+ 
+   /**@brief No initialization constructor */
+-	SIMD_FORCE_INLINE btVector3() {}
++	SIMD_FORCE_INLINE btVector3() {
++	m_floats[0]=m_floats[1]=m_floats[2]=m_floats[3]=btScalar(0.);}
+ 
+  
+ 	
+Index: extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
+===================================================================
+--- extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h.orig	2009-09-14 16:45:32.000000000 +0200
++++ extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h	2010-10-28 14:56:38.000000000 +0200
+@@ -94,7 +94,8 @@ ATTRIBUTE_ALIGNED16 (struct) btOptimized
+ 	//for child nodes
+ 	int	m_subPart;
+ 	int	m_triangleIndex;
+-	int	m_padding[5];//bad, due to alignment
++	int:5*8*sizeof(int);
++//	int	m_padding[5];//bad, due to alignment
+ 
+ 
+ };
diff --git a/blender-2.56-gcc46.patch b/blender-2.56-gcc46.patch
new file mode 100644
index 0000000..f9ab07e
--- /dev/null
+++ b/blender-2.56-gcc46.patch
@@ -0,0 +1,43 @@
+diff -Naur blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h
+--- blender-2.56-beta-source/extern/bullet2/src/BulletSoftBody/btSoftBody.h	2009-09-14 11:45:32.000000000 -0300
++++ blender-2.56-beta-source-new/extern/bullet2/src/BulletSoftBody/btSoftBody.h	2011-02-08 22:32:34.300937158 -0200
+@@ -177,6 +177,7 @@
+ 	/* Material		*/ 
+ 	struct	Material : Element
+ 	{
++                Material (){}
+ 		btScalar				m_kLST;			// Linear stiffness coefficient [0,1]
+ 		btScalar				m_kAST;			// Area/Angular stiffness coefficient [0,1]
+ 		btScalar				m_kVST;			// Volume stiffness coefficient [0,1]
+@@ -191,6 +192,7 @@
+ 	/* Node			*/ 
+ 	struct	Node : Feature
+ 	{
++                Node (){}
+ 		btVector3				m_x;			// Position
+ 		btVector3				m_q;			// Previous step position
+ 		btVector3				m_v;			// Velocity
+@@ -204,6 +206,7 @@
+ 	/* Link			*/ 
+ 	struct	Link : Feature
+ 	{
++                Link (){}
+ 		Node*					m_n[2];			// Node pointers
+ 		btScalar				m_rl;			// Rest length		
+ 		int						m_bbending:1;	// Bending link
+@@ -215,6 +218,7 @@
+ 	/* Face			*/ 
+ 	struct	Face : Feature
+ 	{
++                Face (){} 
+ 		Node*					m_n[3];			// Node pointers
+ 		btVector3				m_normal;		// Normal
+ 		btScalar				m_ra;			// Rest area
+@@ -255,6 +259,7 @@
+ 	/* Note			*/ 
+ 	struct	Note : Element
+ 	{
++                Note (){}
+ 		const char*				m_text;			// Text
+ 		btVector3				m_offset;		// Offset
+ 		int						m_rank;			// Rank
diff --git a/blender-2.57-cmake_include.patch b/blender-2.57-cmake_include.patch
new file mode 100644
index 0000000..d2a0254
--- /dev/null
+++ b/blender-2.57-cmake_include.patch
@@ -0,0 +1,12 @@
+diff -Naur blender-2.57b.orig/source/blender/collada/CMakeLists.txt blender-2.57b/source/blender/collada/CMakeLists.txt
+--- blender-2.57b.orig/source/blender/collada/CMakeLists.txt	2011-03-26 04:09:00.000000000 -0500
++++ blender-2.57b/source/blender/collada/CMakeLists.txt	2011-05-25 09:19:23.922922083 -0500
+@@ -42,7 +42,7 @@
+ 
+ )
+ 
+-if(APPLE)
++if(APPLE OR UNIX)
+ 	list(APPEND INC_SYS
+ 		${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter
+ 		${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils
diff --git a/blender-2.58-blenkernel.patch b/blender-2.58-blenkernel.patch
new file mode 100644
index 0000000..8190bd6
--- /dev/null
+++ b/blender-2.58-blenkernel.patch
@@ -0,0 +1,38 @@
+diff -Naur blender-cycles-2.58.orig/source/blender/blenkernel/CMakeLists.txt blender-cycles-2.58/source/blender/blenkernel/CMakeLists.txt
+--- blender-cycles-2.58.orig/source/blender/blenkernel/CMakeLists.txt	2011-06-28 10:00:42.821785000 -0500
++++ blender-cycles-2.58/source/blender/blenkernel/CMakeLists.txt	2011-07-07 10:41:51.119709118 -0500
+@@ -144,7 +144,6 @@
+ 	intern/unit.c
+ 	intern/world.c
+ 	intern/writeavi.c
+-	intern/writeffmpeg.c
+ 	intern/writeframeserver.c
+ 	
+ 	BKE_DerivedMesh.h
+@@ -225,7 +224,6 @@
+ 	BKE_utildefines.h
+ 	BKE_world.h
+ 	BKE_writeavi.h
+-	BKE_writeffmpeg.h
+ 	BKE_writeframeserver.h
+ 	depsgraph_private.h
+ 	intern/CCGSubSurf.h
+diff -Naur blender-cycles-2.58.orig/source/gameengine/VideoTexture/CMakeLists.txt blender-cycles-2.58/source/gameengine/VideoTexture/CMakeLists.txt
+--- blender-cycles-2.58.orig/source/gameengine/VideoTexture/CMakeLists.txt	2011-06-21 10:47:18.042624000 -0500
++++ blender-cycles-2.58/source/gameengine/VideoTexture/CMakeLists.txt	2011-07-07 10:43:00.184382880 -0500
+@@ -67,7 +67,6 @@
+ 	PyTypeList.cpp
+ 	Texture.cpp
+ 	VideoBase.cpp
+-	VideoFFmpeg.cpp
+ 	blendVideoTex.cpp
+ 
+ 	BlendType.h
+@@ -86,7 +85,6 @@
+ 	PyTypeList.h
+ 	Texture.h
+ 	VideoBase.h
+-	VideoFFmpeg.h
+ )
+ 
+ if(WITH_CODEC_FFMPEG)
diff --git a/blender-2.58-include_install_dir.patch b/blender-2.58-include_install_dir.patch
new file mode 100644
index 0000000..713c5c3
--- /dev/null
+++ b/blender-2.58-include_install_dir.patch
@@ -0,0 +1,12 @@
+diff -Naur blender.orig/source/creator/CMakeLists.txt blender/source/creator/CMakeLists.txt
+--- blender.orig/source/creator/CMakeLists.txt	2011-06-28 10:00:42.821785000 -0500
++++ blender/source/creator/CMakeLists.txt	2011-08-04 15:59:20.323230307 -0500
+@@ -242,7 +242,7 @@
+ 	${CMAKE_SOURCE_DIR}/intern/guardedalloc/MEM_guardedalloc.h
+ 	${CMAKE_SOURCE_DIR}/source/blender/blenloader/BLO_sys_types.h
+ 	${CMAKE_SOURCE_DIR}/source/blender/makesdna/DNA_listBase.h
+-	DESTINATION ${INCLUDE_OUTPUT_PATH})
++	DESTINATION ${INCLUDE_INSTALL_DIR})
+ 
+ # install target
+ if(UNIX AND NOT APPLE)
diff --git a/blender-2.58-nobuffer_ftoa_utf_link.patch b/blender-2.58-nobuffer_ftoa_utf_link.patch
new file mode 100644
index 0000000..4c94864
Binary files /dev/null and b/blender-2.58-nobuffer_ftoa_utf_link.patch differ
diff --git a/blender-2.58-python_include.patch b/blender-2.58-python_include.patch
new file mode 100644
index 0000000..63bdca5
--- /dev/null
+++ b/blender-2.58-python_include.patch
@@ -0,0 +1,11 @@
+diff -Naur blender-2.58.orig/CMakeLists.txt blender-2.58/CMakeLists.txt
+--- blender-2.58.orig/CMakeLists.txt	2011-08-05 14:45:26.776618379 -0500
++++ blender-2.58/CMakeLists.txt	2011-08-05 14:47:21.562887635 -0500
+@@ -307,6 +307,7 @@
+ 		# Use our own instead, since wothout py is such a rare case,
+ 		# require this package
+ 		find_package(PythonLibsUnix REQUIRED)
++		set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+ 	endif()
+ 
+ 
diff --git a/blender-2.58-syspath.patch b/blender-2.58-syspath.patch
index 3acac6a..7e26d59 100644
--- a/blender-2.58-syspath.patch
+++ b/blender-2.58-syspath.patch
@@ -20,17 +20,6 @@ diff -up blender-2.57/source/blender/blenfont/intern/blf_lang.c.syspath blender-
  }
  
  /* XXX WARNING!!! IN osx somehow the previous function call jumps in this one??? (ton, ppc) */
-diff -up blender-2.58/intern/ghost/intern/GHOST_SystemPathsX11.cpp.sp blender-2.58/intern/ghost/intern/GHOST_SystemPathsX11.cpp
---- blender-2.58/intern/ghost/intern/GHOST_SystemPathsX11.cpp.sp	2011-06-30 17:58:48.955000009 +0200
-+++ blender-2.58/intern/ghost/intern/GHOST_SystemPathsX11.cpp	2011-06-30 17:59:59.334000028 +0200
-@@ -56,6 +56,7 @@ GHOST_SystemPathsX11::~GHOST_SystemPaths
- const GHOST_TUns8* GHOST_SystemPathsX11::getSystemDir() const
- {
- 	/* no prefix assumes a portable build which only uses bundled scripts */
-+  printf("##1: PREFIX: %s\n", PREFIX);
- #ifdef PREFIX
- 	return (GHOST_TUns8*) PREFIX "/share";
- #else
 diff -up blender-2.58/source/blender/blenlib/intern/path_util.c.sp blender-2.58/source/blender/blenlib/intern/path_util.c
 --- blender-2.58/source/blender/blenlib/intern/path_util.c.sp	2011-06-22 17:24:58.000000000 +0200
 +++ blender-2.58/source/blender/blenlib/intern/path_util.c	2011-06-30 17:47:50.532000005 +0200
diff --git a/blender.spec b/blender.spec
index 1f1d87e..1f15af3 100644
--- a/blender.spec
+++ b/blender.spec
@@ -9,7 +9,7 @@
 Name:           blender
 Epoch:		1
 Version:        2.58a
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -18,7 +18,7 @@ License:        GPLv2
 URL:            http://www.blender.org
 
 Source0:	http://download.blender.org/source/blender-%{version}.tar.gz
-
+Source1:	blenderplayer.1
 Source5:        blender.xml
 
 Source10:	macros.blender
@@ -26,6 +26,15 @@ Source10:	macros.blender
 Patch1:		blender-2.44-bid.patch
 Patch2:		blender-2.58-syspath.patch
 
+Patch3:		blender-2.48-python64.patch
+Patch4:		blender-2.48-undefine-operation.patch
+Patch5:		blender-2.50-uninit-var.patch
+Patch6:		blender-2.56-gcc46.patch
+Patch7:		blender-2.57-cmake_include.patch
+Patch8:		blender-2.58-nobuffer_ftoa_utf_link.patch
+Patch9:		blender-2.58-include_install_dir.patch
+Patch10:	blender-2.58-python_include.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -59,6 +68,11 @@ BuildRequires:	ode-devel
 BuildRequires:	openjpeg-devel
 BuildRequires:  qhull-devel
 
+BuildRequires:	xz-devel
+BuildRequires:	jack-audio-connection-kit-devel
+
+BuildRequires:	openCOLLADA-devel >= svn825
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -109,6 +123,14 @@ addon packages to extend blender.
 %setup -q 
 %patch1 -p1 -b .bid
 %patch2 -p1 -b .syspath
+%patch3 -p0
+%patch4 -p0
+%patch5 -p0
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+# %patch9 -p1
+%patch10 -p1
 
 find -name '.svn' -print | xargs rm -rf
 
@@ -123,6 +145,17 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %endif
  -DCMAKE_SKIP_RPATH=ON \
  -DBUILD_SHARED_LIBS=OFF \
+ -DWITH_FFTW3:BOOL=ON \
+ -DWITH_JACK:BOOL=ON \
+ -DWITH_CODEC_SNDFILE:BOOL=ON \
+ -DWITH_IMAGE_OPENJPEG:BOOL=ON \
+ -DWITH_OPENCOLLADA:BOOL=ON \
+ -DOPENCOLLADA=%{_includedir} \
+ -DWITH_PYTHON:BOOL=ON \
+ -DWITH_PYTHON_INSTALL:BOOL=OFF \
+ -DWITH_CODEC_FFMPEG:BOOL=OFF \
+ -DWITH_GAMEENGINE:BOOL=ON \
+ -DWITH_CXX_GUARDEDALLOC:BOOL=OFF \
  -DWITH_BUILTIN_GLEW=OFF \
  -DWITH_INSTALL_PORTABLE=OFF \
  -DWITH_PYTHON_SAFETY=ON \
@@ -197,6 +230,7 @@ rm -rf ${RPM_BUILD_ROOT}%{blenderarch}/plugins/*
 
 mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man1
 install -p -D -m 644 doc/manpage/blender.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
+install -p -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 #
 # rpm macros
@@ -242,6 +276,7 @@ fi || :
 %files -n blenderplayer
 %defattr(-,root,root,-)
 %{_bindir}/blenderplayer
+%{_mandir}/man1/blenderplayer.*
 %doc COPYING doc/license/*-license.txt
 
 %files rpm-macros
@@ -249,6 +284,11 @@ fi || :
 %{_sysconfdir}/rpm/macros.blender
 
 %changelog
+* Sun Aug  7 2011 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.58a-4
+- Add man page for blenderplayer
+- Add support for openCOLLADA
+- Remove debugging statement from syspath patch
+
 * Mon Aug  1 2011 Jochen Schmitt <Jochen herr-schmitt de> 1:2.58a-3
 - Cleanup
 
diff --git a/blenderplayer.1 b/blenderplayer.1
new file mode 100644
index 0000000..d027c55
--- /dev/null
+++ b/blenderplayer.1
@@ -0,0 +1,117 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.38.2.
+.TH BLENDERPLAYER "1" "November 2010" "Stichting Blender Foundation" "User Commands"
+.SH NAME
+blenderplayer \- a utility for previewing .blend files
+.SH DESCRIPTION
+usage:   blenderplayer [\-w [w h l t]] [\-f [fw fh fb ff]] [\-g gamengineoptions] [\-s stereomode] filename.blend
+.HP
+\fB\-h\fR: Prints this command summary
+.HP
+\fB\-w\fR: display in a window
+.HP
+\fB\-\-Optional\fR parameters\-\-
+.IP
+w = window width
+h = window height
+.IP
+l = window left coordinate
+t = window top coordinate
+Note: If w or h is defined, both must be defined.
+.IP
+Also, if l or t is defined, all options must be used.
+.HP
+\fB\-f\fR: start game in full screen mode
+.HP
+\fB\-\-Optional\fR parameters\-\-
+.IP
+fw = full screen mode pixel width
+fh = full screen mode pixel height
+.IP
+fb = full screen mode bits per pixel
+ff = full screen mode frequency
+Note: If fw or fh is defined, both must be defined.
+.IP
+Also, if fb is used, fw and fh must be used. ff requires all options.
+.HP
+\fB\-s\fR: start player in stereo
+.TP
+stereomode: hwpageflip
+(Quad buffered shutter glasses)
+.TP
+syncdoubling
+(Above Below)
+.TP
+sidebyside
+(Left Right)
+.TP
+anaglyph
+(Red\-Blue glasses)
+.TP
+vinterlace
+(Vertical interlace for autostereo display)
+.IP
+depending on the type of stereo you want
+.HP
+\fB\-D\fR: start player in dome mode
+.HP
+\fB\-\-Optional\fR parameters\-\-
+.TP
+angle
+= field of view in degrees
+.TP
+tilt
+= tilt angle in degrees
+.IP
+warpdata = a file to use for warping the image (absolute path)
+mode: fisheye                (Fisheye)
+.TP
+truncatedfront
+(Front\-Truncated)
+.TP
+truncatedrear
+(Rear\-Truncated)
+.TP
+cubemap
+(Cube Map)
+.TP
+sphericalpanoramic
+(Spherical Panoramic)
+.IP
+depending on the type of dome you are using
+.HP
+\fB\-i\fR: parent windows ID
+.HP
+\fB\-d\fR: turn debugging on
+.HP
+\fB\-g\fR: game engine options:
+.TP
+Name
+Default      Description
+.HP
+\fB\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\fR
+.TP
+fixedtime
+0         "Enable all frames"
+.TP
+nomipmap
+0         Disable mipmaps
+.TP
+show_framerate
+0         Show the frame rate
+.TP
+show_properties
+0         Show debug properties
+.TP
+show_profile
+0         Show profiling information
+.TP
+blender_material
+0         Enable material settings
+.TP
+ignore_deprecation_warnings
+1         Ignore deprecation warnings
+.IP
+\- : all arguments after this are ignored, allowing python to access them from sys.argv
+.PP
+example: blenderplayer \fB\-w\fR 320 200 10 10 \fB\-g\fR noaudio//home//user//filename.blend
+example: blenderplayer \fB\-g\fR show_framerate = 0 //home//user//filename.blend