[SCM] yafaray/master: debian/patches/: patchset updated

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Mon Sep 9 15:02:33 UTC 2013 

The following commit has been merged in the master branch:
commit 978c6f5ca333e7a33b7f403f1c7faa5aa11eebc8
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Sep 9 15:42:49 2013 +0200

    debian/patches/: patchset updated
    
    - 0001-Fix_FTBFS_on_ARM.patch refreshed
    - 0002-Disable_FAST_MATH.patch dropped
      since the #include was removed upstream
    - 0003-Fix_FTBFS_against_python3.3.patch renamed to #0002

diff --git a/debian/patches/0001-Fix_FTBFS_on_ARM.patch b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
index 4da462e..15cc57f 100644
--- a/debian/patches/0001-Fix_FTBFS_on_ARM.patch
+++ b/debian/patches/0001-Fix_FTBFS_on_ARM.patch
@@ -1,5 +1,5 @@
 From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Wed, 23 May 2012 17:58:25 +0200
+Date: Mon, 9 Sep 2013 15:41:33 +0200
 Subject: Fix_FTBFS_on_ARM
 
 ---
@@ -7,7 +7,7 @@ Subject: Fix_FTBFS_on_ARM
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/yafraycore/triangle.cc b/src/yafraycore/triangle.cc
-index d9b30e4..72c89cd 100644
+index 14d5425..89407d5 100644
 --- a/src/yafraycore/triangle.cc
 +++ b/src/yafraycore/triangle.cc
 @@ -6,7 +6,7 @@ __BEGIN_YAFRAY
@@ -18,8 +18,8 @@ index d9b30e4..72c89cd 100644
 +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
+ 
+@@ -104,7 +104,7 @@ inline void triangle_t::getSurface(surfacePoint_t &sp, const point3d_t &hit, int
  	sp.light = mesh->light;
  }
  
@@ -28,16 +28,16 @@ index d9b30e4..72c89cd 100644
  {
  	if(axis>=0) // re-clip
  	{
-@@ -141,7 +141,7 @@ inline bool triangle_t::clipToBound(double bound[2][3], int axis, bound_t &clipp
+@@ -138,7 +138,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
+@@ -150,7 +150,7 @@ inline float triangle_t::surfaceArea() const
  	return 0.5 * (edge1 ^ edge2).length();
  }
  
@@ -46,7 +46,7 @@ index d9b30e4..72c89cd 100644
  {
  	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)
+@@ -165,7 +165,7 @@ inline void triangle_t::sample(float s1, float s2, point3d_t &p, vector3d_t &n)
  
  // triangleInstance_t Methods
  
@@ -55,7 +55,7 @@ index d9b30e4..72c89cd 100644
  {
  	sp.Ng = getNormal();
  	int pa = mBase->pa;
-@@ -287,7 +287,7 @@ inline void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &
+@@ -282,7 +282,7 @@ inline void triangleInstance_t::getSurface(surfacePoint_t &sp, const point3d_t &
  	sp.light = mesh->mBase->light;
  }
  
@@ -64,16 +64,16 @@ index d9b30e4..72c89cd 100644
  {
  	if(axis>=0) // re-clip
  	{
-@@ -335,7 +335,7 @@ inline bool triangleInstance_t::clipToBound(double bound[2][3], int axis, bound_
+@@ -330,7 +330,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
+@@ -342,7 +342,7 @@ inline float triangleInstance_t::surfaceArea() const
  	return 0.5 * (edge1 ^ edge2).length();
  }
  
diff --git a/debian/patches/0002-Disable_FAST_MATH.patch b/debian/patches/0002-Disable_FAST_MATH.patch
deleted file mode 100644
index c9f3690..0000000
--- a/debian/patches/0002-Disable_FAST_MATH.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sat, 26 May 2012 16:15:53 +0200
-Subject: Disable_FAST_MATH
-
----
- include/utilities/mathOptimizations.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/utilities/mathOptimizations.h b/include/utilities/mathOptimizations.h
-index b228851..9dbffc5 100644
---- a/include/utilities/mathOptimizations.h
-+++ b/include/utilities/mathOptimizations.h
-@@ -53,7 +53,7 @@
- //# define M_SQRT2	1.41421356237309504880	/* sqrt(2) */
- //# define M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
- 
--#define FAST_MATH
-+//#define FAST_MATH
- #define FAST_TRIG
- 
- __BEGIN_YAFRAY
diff --git a/debian/patches/0003-Fix_FTBFS_against_python3.3.patch b/debian/patches/0002-Fix_FTBFS_against_python3.3.patch
similarity index 97%
rename from debian/patches/0003-Fix_FTBFS_against_python3.3.patch
rename to debian/patches/0002-Fix_FTBFS_against_python3.3.patch
index 28267ca..85e3249 100644
--- a/debian/patches/0003-Fix_FTBFS_against_python3.3.patch
+++ b/debian/patches/0002-Fix_FTBFS_against_python3.3.patch
@@ -7,7 +7,7 @@ Subject: Fix_FTBFS_against_python3.3
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt
-index a53d941..51607db 100644
+index 42dec5d..e1b72f9 100644
 --- a/src/bindings/CMakeLists.txt
 +++ b/src/bindings/CMakeLists.txt
 @@ -40,7 +40,7 @@ IF (WITH_YAF_PY_BINDINGS)
diff --git a/debian/patches/series b/debian/patches/series
index b703e55..cf8dafa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Fix_FTBFS_on_ARM.patch
-0002-Disable_FAST_MATH.patch
-0003-Fix_FTBFS_against_python3.3.patch
+0002-Fix_FTBFS_against_python3.3.patch

-- 
yafaray packaging

More information about the pkg-multimedia-commits mailing list