summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2005-09-04 14:02:42 +0000
committerSimon Stelling <blubb@gentoo.org>2005-09-04 14:02:42 +0000
commitbc8d33e13b9aed0d5f3ef3370664236753533354 (patch)
tree91308ef560c998325c3663d5e3a4e6c8d1d6eed5 /media-gfx/yafray/files
parentx86 stable on 1.1. 1.0 fails on newer gcc - to be removed soon (diff)
downloadhistorical-bc8d33e13b9aed0d5f3ef3370664236753533354.tar.gz
historical-bc8d33e13b9aed0d5f3ef3370664236753533354.tar.bz2
historical-bc8d33e13b9aed0d5f3ef3370664236753533354.zip
fixed evil ptr->int cast and made it multilib-strict aware
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-gfx/yafray/files')
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-64bit.patch16
-rw-r--r--media-gfx/yafray/files/yafray-0.0.8-multilib.patch22
2 files changed, 38 insertions, 0 deletions
diff --git a/media-gfx/yafray/files/yafray-0.0.8-64bit.patch b/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
new file mode 100644
index 000000000000..87589ccb9fac
--- /dev/null
+++ b/media-gfx/yafray/files/yafray-0.0.8-64bit.patch
@@ -0,0 +1,16 @@
+--- src/loader/render.cc.old 2005-09-04 15:32:46.000000000 +0200
++++ src/loader/render.cc 2005-09-04 15:33:01.000000000 +0200
+@@ -721,11 +721,11 @@
+ }
+ for(vector<triangle_t>::iterator i=faces.begin();i!=faces.end();++i)
+ {
+- long int n=(int)((*i).a);
++ long int n=(long int)((*i).a);
+ if((n>=(long int)mesh->points->points.size()) || (n<0))
+ { WARNING<<"Point "<<n<<" out of bounds in object\n"; n=0; }
+ (*i).a=&(mesh->points->points)[n];
+- n=(int)((*i).b);
++ n=(long int)((*i).b);
+ if((n>=(long int)mesh->points->points.size()) || (n<0))
+ { WARNING<<"Point "<<n<<" out of bounds in object\n"; n=0; }
+ (*i).b=&(mesh->points->points)[n];
diff --git a/media-gfx/yafray/files/yafray-0.0.8-multilib.patch b/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
new file mode 100644
index 000000000000..1b68c2e6fc4b
--- /dev/null
+++ b/media-gfx/yafray/files/yafray-0.0.8-multilib.patch
@@ -0,0 +1,22 @@
+--- linux-settings.py.old 2005-09-04 15:51:15.000000000 +0200
++++ linux-settings.py 2005-09-04 15:52:29.000000000 +0200
+@@ -10,8 +10,8 @@
+ global prefix
+ prefix = args.get('prefix','/usr/local')
+
+-def get_libpath(args): return prefix+"/lib"
+-def get_pluginpath(args): return prefix+"/lib/yafray"
++def get_libpath(args): return prefix+"/lib64"
++def get_pluginpath(args): return prefix+"/lib64/yafray"
+ def get_binpath(args): return prefix+"/bin"
+ def get_confpath(args): return prefix+"/etc"
+ def get_cxxflags(args):
+@@ -34,7 +34,7 @@
+ return False
+
+ def get_include(args): return [ exr.PATH + "/include/OpenEXR" ]
+- def get_libpath(args): return [ exr.PATH + "/lib" ]
++ def get_libpath(args): return [ exr.PATH + "/lib64" ]
+ def get_libs(args): return ['IlmImf', 'Imath', 'Iex', 'Half']
+
+ class jpeg(globalinfo.library):