[embree] patch refused to be applied

[Luya Tshimbalanga <luya@xxxxxxxxxxxxxxxxx>]

Hello team,

I applied a patch sent by upstream but some odd reason, the build kept
on failing

https://koji.fedoraproject.org/koji/taskinfo?taskID=17472254

I include the patch for preview so someone can see what went wrong.

Thanks

-- 
Luya Tshimbalanga
Graphic & Web Designer
E: luya@xxxxxxxxxxxxxxxxx
W: http://www.coolest-storm.net

diff -ru embree-2.13.0-orig/kernels/common/accel.cpp embree-2.13.0/kernels/common/accel.cpp
--- embree-2.13.0-orig/kernels/common/accel.cpp	2016-11-21 01:12:33.000000000 -0800
+++ embree-2.13.0/kernels/common/accel.cpp	2017-01-28 20:47:13.979363972 -0800
@@ -54,4 +54,13 @@
   
   Accel::IntersectorN::IntersectorN (IntersectFuncN intersect, OccludedFuncN occluded, const char* name)
     : intersect(intersect), occluded(occluded), name(name) {}
+    
+  RayStreamFilterFuncs::RayStreamFilterFuncs()
+    : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {}
+  
+  RayStreamFilterFuncs::RayStreamFilterFuncs(void (*ptr) ()) 
+    : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {}
+  
+  RayStreamFilterFuncs::RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop) 
+    : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {}
 }
diff -ru embree-2.13.0-orig/kernels/common/accel.h embree-2.13.0/kernels/common/accel.h
--- embree-2.13.0-orig/kernels/common/accel.h	2016-11-21 01:12:33.000000000 -0800
+++ embree-2.13.0/kernels/common/accel.h	2017-01-28 20:49:01.041013824 -0800
@@ -454,15 +454,9 @@
 
   struct RayStreamFilterFuncs
   {
-    __forceinline RayStreamFilterFuncs()
-      : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {}
-    
-    __forceinline RayStreamFilterFuncs(void (*ptr) ()) 
-      : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {}
-
-    __forceinline RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop) 
-      : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {}
-
+    RayStreamFilterFuncs();
+    RayStreamFilterFuncs(void (*ptr) ());
+    RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop);
   public:
     filterAOS_func filterAOS;
     filterAOP_func filterAOP;

Attachment: signature.asc
Description: OpenPGP digital signature

_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx