[SCM] yafaray/master: debian/patches/: #0002 added to fix FTBFS on ARM

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 87d36840f62d80ca9d369255388331e6669ff8e9
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Apr 24 08:57:35 2012 +0200

    debian/patches/: #0002 added to fix FTBFS on ARM
    
    Thanks: Michele Castigliego for upstream support
    Closes: #654625

diff --git a/debian/patches/0002-Fix_FTBFS_on_ARM.patch b/debian/patches/0002-Fix_FTBFS_on_ARM.patch
new file mode 100644
index 0000000..ef17773
--- /dev/null
+++ b/debian/patches/0002-Fix_FTBFS_on_ARM.patch
@@ -0,0 +1,84 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Tue, 24 Apr 2012 08:52:16 +0200
+Subject: Fix_FTBFS_on_ARM
+
+---
+ src/yafraycore/triangle.cc |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
+index 05b8751..f2b160b 100644
+--- a/src/yafraycore/triangle.cc
++++ b/src/yafraycore/triangle.cc
+@@ -6,7 +6,7 @@ __BEGIN_YAFRAY
+ int triBoxClip(const double b_min[3], const double b_max[3], const double triverts[3][3], bound_t &box, void* n_dat);
+ int triPlaneClip(double pos, int axis, bool lower, bound_t &box, void* o_dat, void* n_dat);
+ 
+-inline void triangle_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, intersectData_t &data) const
++void triangle_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, intersectData_t &data) const
+ {
+ 	sp.Ng = getNormal();
+ 	data.calcB0();
+@@ -107,7 +107,7 @@ inline void triangle_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, int
+ 	sp.light = mesh->light;
+ }
+ 
+-inline bool triangle_t::clipToBound(double bound[2][3], int axis, bound_t &clipped, void *d_old, void *d_new) const
++bool triangle_t::clipToBound(double bound[2][3], int axis, bound_t &clipped, void *d_old, void *d_new) const
+ {
+ 	if(axis>=0) // re-clip
+ 	{
+@@ -141,7 +141,7 @@ inline bool triangle_t::clipToBound(double bound[2][3], int axis, bound_t &clipp
+ 	return true;
+ }
+ 	
+-inline float triangle_t::surfaceArea() const
++float triangle_t::surfaceArea() const
+ {
+     point3d_t const& a = mesh->getVertex(pa);
+     point3d_t const& b = mesh->getVertex(pb);
+@@ -153,7 +153,7 @@ inline float triangle_t::surfaceArea() const
+ 	return 0.5 * (edge1 ^ edge2).length();
+ }
+ 
+-inline void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
++void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
+ {
+     point3d_t const& a = mesh->getVertex(pa);
+     point3d_t const& b = mesh->getVertex(pb);
+@@ -168,7 +168,7 @@ inline void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n)
+ 
+ // triangleInstance_t Methods
+ 
+-inline void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, intersectData_t &data) const
++void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, intersectData_t &data) const
+ {
+ 	sp.Ng = getNormal();
+     int pa = mBase->pa;
+@@ -287,7 +287,7 @@ inline void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &
+ 	sp.light = mesh->mBase->light;
+ }
+ 
+-inline bool triangleInstance_t::clipToBound(double bound[2][3], int axis, bound_t &clipped, void *d_old, void *d_new) const
++bool triangleInstance_t::clipToBound(double bound[2][3], int axis, bound_t &clipped, void *d_old, void *d_new) const
+ {
+ 	if(axis>=0) // re-clip
+ 	{
+@@ -335,7 +335,7 @@ inline bool triangleInstance_t::clipToBound(double bound[2][3], int axis, bound_
+ 	return true;
+ }
+ 	
+-inline float triangleInstance_t::surfaceArea() const
++float triangleInstance_t::surfaceArea() const
+ {
+     point3d_t const& a = mesh->getVertex(mBase->pa);
+     point3d_t const& b = mesh->getVertex(mBase->pb);
+@@ -347,7 +347,7 @@ inline float triangleInstance_t::surfaceArea() const
+ 	return 0.5 * (edge1 ^ edge2).length();
+ }
+ 
+-inline void triangleInstance_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
++void triangleInstance_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n) const
+ {
+     point3d_t const& a = mesh->getVertex(mBase->pa);
+     point3d_t const& b = mesh->getVertex(mBase->pb);
diff --git a/debian/patches/series b/debian/patches/series
index 91408b2..6998ff5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix_FTBFS_with_gcc-4.7.patch
+0002-Fix_FTBFS_on_ARM.patch

-- 
yafaray packaging