[med-svn] r9046 - trunk/packages/sofa-framework/trunk/debian/patches

Andreas Tille tille at alioth.debian.org
Mon Dec 19 15:31:06 UTC 2011 

Author: tille
Date: 2011-12-19 15:31:05 +0000 (Mon, 19 Dec 2011)
New Revision: 9046

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch
   trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch
Removed:
   trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
   trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
   trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
   trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
   trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Added missing patch description, un-dpatch patches


Added: trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch	2011-12-19 15:31:05 UTC (rev 9046)
@@ -0,0 +1,28 @@
+Author: Dominique Belhachemi <domibel at debian.org>
+Description: fixes a build error on MIPS, ARM, and SuperH (sqrt/sqrtl)
+
+--- sofa-1.0-rc1.orig/framework/sofa/helper/rmath.h
++++ sofa-1.0-rc1/framework/sofa/helper/rmath.h
+@@ -130,8 +130,8 @@
+ 
+ inline double rsqrt(const double& a)
+ {
+-#if defined(__GNUC__)
+-    return sqrt(a);
++#if defined(__arm__) || defined(__mips__) || defined(__sh__)
++    return sqrt((double)a);
+ #else
+     return (double)sqrtl((long double)a);
+ #endif
+@@ -139,7 +139,11 @@
+ 
+ inline long double rsqrt(const long double& a)
+ {
++#if defined(__arm__) || defined(__mips__) || defined(__sh__)
++    return (long double)sqrt((double)a);
++#else
+     return sqrtl(a);
++#endif
+ }
+ 
+ template<class T>

Modified: trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,3 +1,7 @@
+Author: Dominique Belhachemi <domibel at debian.org>
+Description: added #include headers required by GCC 4.4
+Bug-Closed: http://bugs.debian.org/505953
+
 --- sofa-1.0-rc1.orig/framework/sofa/helper/LCPSolver.inl
 +++ sofa-1.0-rc1/framework/sofa/helper/LCPSolver.inl
 @@ -26,6 +26,7 @@

Modified: trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,3 +1,6 @@
+Author: Dominique Belhachemi <domibel at debian.org>
+Description: Fix some tinyxml include statements
+
 --- sofa-1.0-rc1.orig/applications/sofa/gui/qt/GraphVisitor.cpp
 +++ sofa-1.0-rc1/applications/sofa/gui/qt/GraphVisitor.cpp
 @@ -26,10 +26,7 @@

Modified: trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,3 +1,7 @@
+Authors: Dominique Belhachemi <domibel at debian.org>,
+         Andreas Tille <tille at debian.org>
+Description: Link sofa to Debians newmat, boost, xml2 and qwt library.
+
 --- sofa-1.0-rc1.orig/sofa-default.prf
 +++ sofa-1.0-rc1/sofa-default.prf
 @@ -19,7 +19,8 @@

Added: trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch	2011-12-19 15:31:05 UTC (rev 9046)
@@ -0,0 +1,19 @@
+Authors: Dominique Belhachemi <domibel at debian.org>,
+Description: fix: error: bits/atomicity.h: No such file or directory
+
+--- sofa-1.0-rc1.orig/framework/sofa/helper/system/atomic.h
++++ sofa-1.0-rc1/framework/sofa/helper/system/atomic.h
+@@ -29,9 +29,10 @@
+ 
+ #if defined(SOFA_USE_ASM_ATOMIC)
+ #include <asm/atomic.h>
+-#include <bits/atomicity.h> // for __exchange_and_add
+-#elif defined(__GNUC__) && (defined(i386) || defined(__i386__) || defined(__x86_64__))
+-// custom ASM code, no include
++#endif
++
++#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 )
++#  include <ext/atomicity.h>
+ #elif defined(__GNUC__)
+ // Fall-back mode: stdc++ atomic operations (should be available on all gcc-supported platforms)
+ #include <bits/atomicity.h>

Deleted: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_fix_mips_sqrt.dpatch by  <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fixes a build error on MIPS, ARM, and SuperH (sqrt/sqrtl)
-
- at DPATCH@
-Index: sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h
-===================================================================
---- sofa-framework-1.0~beta4.orig/framework/sofa/helper/rmath.h	2009-12-06 14:23:24.000000000 -0500
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h	2009-12-06 14:23:29.000000000 -0500
-@@ -132,8 +132,8 @@
- 
- inline double rsqrt(const double& a)
- {
--#if defined(__GNUC__)
--    return sqrt(a);
-+#if defined(__arm__) || defined(__mips__) || defined(__sh__)
-+    return sqrt((double)a);
- #else
-     return (double)sqrtl((long double)a);
- #endif
-@@ -141,7 +141,11 @@
- 
- inline long double rsqrt(const long double& a)
- {
-+#if defined(__arm__) || defined(__mips__) || defined(__sh__)
-+    return (long double)sqrt((double)a);
-+#else
-     return sqrtl(a);
-+#endif
- }
- 
- template<class T>

Deleted: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,23 +0,0 @@
-## 78_atomicity.dpatch by  <domibel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix: error: bits/atomicity.h: No such file or directory
-
-Index: sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h
-===================================================================
---- sofa-framework-1.0~beta4.orig/framework/sofa/helper/system/atomic.h	2009-12-06 14:20:15.000000000 -0500
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h	2009-12-06 14:20:36.000000000 -0500
-@@ -31,9 +31,10 @@
- 
- #if defined(SOFA_USE_ASM_ATOMIC)
- #include <asm/atomic.h>
--#include <bits/atomicity.h> // for __exchange_and_add
--#elif defined(__GNUC__) && (defined(i386) || defined(__i386__) || defined(__x86_64__))
--// custom ASM code, no include
-+#endif
-+
-+#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 )
-+#  include <ext/atomicity.h>
- #elif defined(__GNUC__)
- // Fall-back mode: stdc++ atomic operations (should be available on all gcc-supported platforms)
- #include <bits/atomicity.h>

Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:19:23 UTC (rev 9045)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series	2011-12-19 15:31:05 UTC (rev 9046)
@@ -1,8 +1,8 @@
 10_gcc4.4.patch
 10_missing_includes.patch
 20_debian_config.patch
-55_fix_mips_sqrt.diff
-78_atomicity.diff
+10_fix_mips_sqrt.patch
+20_ignore_missing_atomicity_h.patch
 fix_mutable_serr_sout.diff
 tinyxml26.diff
 qwt5-qt4.patch

More information about the debian-med-commit mailing list