[blender/f18] fix build on non-x86 64-bit arches

[Dan Horák]

commit f1229a527628464ee8dc3542b388f7a09084ea70
Author: Dan Horák <dan at danny.cz>
Date:   Fri Oct 5 18:55:54 2012 +0200

    fix build on non-x86 64-bit arches

 blender-2.64-64bit.patch |   12 ++++++++++++
 blender.spec             |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/blender-2.64-64bit.patch b/blender-2.64-64bit.patch
new file mode 100644
index 0000000..0b4969c
--- /dev/null
+++ b/blender-2.64-64bit.patch
@@ -0,0 +1,12 @@
+diff -up blender-2.64/intern/cycles/util/util_cuda.h.64bit blender-2.64/intern/cycles/util/util_cuda.h
+--- blender-2.64/intern/cycles/util/util_cuda.h.64bit	2012-10-05 17:34:55.000000000 +0200
++++ blender-2.64/intern/cycles/util/util_cuda.h	2012-10-05 17:35:15.000000000 +0200
+@@ -38,7 +38,7 @@ CCL_NAMESPACE_END
+ 
+ #define CUDA_VERSION 3020
+ 
+-#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
++#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__LP64__)
+ typedef unsigned long long CUdeviceptr;
+ #else
+ typedef unsigned int CUdeviceptr;
diff --git a/blender.spec b/blender.spec
index 51e73d8..8981662 100644
--- a/blender.spec
+++ b/blender.spec
@@ -13,7 +13,7 @@
 Name:           blender
 Epoch:          1
 Version:        %{blender_api}
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -31,6 +31,8 @@ Patch1:         blender-2.64-syspath.patch
 
 Patch2:        blender-2.58-python_include.patch
 Patch3:        blender-2.64-openjpeg_stdbool.patch
+# fix build on non-x86 64-bit arches
+Patch4:        blender-2.64-64bit.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -139,6 +141,7 @@ addon packages to extend blender.
 %patch1 -p1 -b .syspath
 %patch2 -p1
 %patch3 -p1 -b .openjpeg_stdbool
+%patch4 -p1 -b .64bit
 
 find -name '.svn' -print | xargs rm -rf
 
@@ -270,6 +273,9 @@ fi || :
 %{_sysconfdir}/rpm/macros.blender
 
 %changelog
+* Fri Oct  5 2012 Dan Horák <dan[at]danny.cz> - 1:2.64-2
+- fix build on non-x86 64-bit arches
+
 * Wed Oct  3 2012 Jochen Schmitt <Jochen herr-schmitt de> - 1:2.64-1
 - New upstream release