[med-svn] r3480 - in trunk/packages/sofa-framework/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Wed Jun 10 22:06:47 UTC 2009
Author: domibel-guest
Date: 2009-06-10 22:06:46 +0000 (Wed, 10 Jun 2009)
New Revision: 3480
Added:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch
Modified:
trunk/packages/sofa-framework/trunk/debian/changelog
trunk/packages/sofa-framework/trunk/debian/control
trunk/packages/sofa-framework/trunk/debian/get-orig-source
trunk/packages/sofa-framework/trunk/debian/patches/00list
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
Log:
add some patches
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2009-06-10 04:29:17 UTC (rev 3479)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2009-06-10 22:06:46 UTC (rev 3480)
@@ -4,6 +4,7 @@
* Qt OGRE 3D viewer disabled (Closes: #527706)
* MIPS/ARM patch, AMD64 patch and Newmat patch removed because they
have been applied by upstream (Thanks to Everton Hermann)
+ * depends on libsuitesparse-dev now (Closes: #532693)
-- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 07 Jun 2009 14:35:15 -0400
Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control 2009-06-10 04:29:17 UTC (rev 3479)
+++ trunk/packages/sofa-framework/trunk/debian/control 2009-06-10 22:06:46 UTC (rev 3480)
@@ -6,7 +6,8 @@
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
Build-Depends: debhelper (>= 7), dpatch, freeglut3-dev, libnewmat10-dev,
libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev, libxml2-dev,
- libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config
+ libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config,
+ libsuitesparse-dev
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.8.1
Homepage: http://www.sofa-framework.org/
Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-06-10 04:29:17 UTC (rev 3479)
+++ trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-06-10 22:06:46 UTC (rev 3480)
@@ -19,9 +19,9 @@
rm -rf extlibs/libQGLViewer # libqglviewer-dev
rm -rf extlibs/qwt # libqwt-dev
rm -rf extlibs/newmat # libnewmat10-dev
-
+rm -rf extlibs/csparse # libsuitesparse-dev
# the external libraries are still there:
-# csparse LML miniFlowVR PML tinyxml
+# LML miniFlowVR PML tinyxml
cd ..
Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-06-10 04:29:17 UTC (rev 3479)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-06-10 22:06:46 UTC (rev 3480)
@@ -1 +1,4 @@
+13_gcc4.4.dpatch
50_all_changes.dpatch
+55_fix_mips_sqrt.dpatch
+78_atomicity.dpatch
Added: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch 2009-06-10 22:06:46 UTC (rev 3480)
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_gcc4.4.dpatch by <domibel at ve2056622895.ihrserver.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: added #include headers required by GCC 4.4 (Closes: #505953)
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:49.000000000 -0400
+@@ -28,6 +28,7 @@
+ #define SOFA_HELPER_LCPSOLVER_INL
+
+ #include <sofa/helper/LCPSolver.h>
++#include <cstdio>
+
+ namespace sofa
+ {
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl 2009-06-09 21:10:49.000000000 -0400
+@@ -28,6 +28,7 @@
+ #define SOFA_HELPER_QUATER_INL
+
+ #include "Quater.h"
++#include <cstdio>
+ #include <math.h>
+ #include <iostream>
+
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <sofa/helper/io/ImagePNG.h>
+ #endif
+
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -26,6 +26,7 @@
+ ******************************************************************************/
+ #include <sofa/helper/io/ImageBMP.h>
+ #include <sofa/helper/system/FileRepository.h>
++#include <cstdio>
+ #include <iostream>
+
+ namespace sofa
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sofa/helper/io/ImageRAW.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <iostream>
++#include <cstdio>
+
+ namespace sofa
+ {
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sofa/helper/io/MeshTrian.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #include <iostream>
+ #include <string>
+
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch 2009-06-10 04:29:17 UTC (rev 3479)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch 2009-06-10 22:06:46 UTC (rev 3480)
@@ -7,8 +7,8 @@
@DPATCH@
diff -urNad sofa-framework-1.0~beta4~/Sofa.pro sofa-framework-1.0~beta4/Sofa.pro
---- sofa-framework-1.0~beta4~/Sofa.pro 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/Sofa.pro 2009-06-07 14:40:17.000000000 -0400
+--- sofa-framework-1.0~beta4~/Sofa.pro 2009-06-10 17:48:18.000000000 -0400
++++ sofa-framework-1.0~beta4/Sofa.pro 2009-06-10 17:49:21.000000000 -0400
@@ -3,10 +3,10 @@
include($${SOFA_DIR}/sofa.cfg)
@@ -22,7 +22,16 @@
contains(DEFINES,SOFA_XML_PARSER_TINYXML){
SUBDIRS += extlibs/tinyxml
-@@ -28,7 +28,7 @@
+@@ -21,14 +21,15 @@
+ #CSParse
+
+ contains(DEFINES,SOFA_HAVE_CSPARSE){
+- SUBDIRS += extlibs/csparse
++# use Debian's system library instead of the one in extlibs
++# SUBDIRS += extlibs/csparse
+ }
+
+
#QGLViewer
contains(DEFINES,SOFA_GUI_QGLVIEWER){
@@ -32,8 +41,8 @@
# PML
diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/gl/DrawManager.cpp sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/DrawManager.cpp 2009-03-20 18:40:53.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2009-06-07 14:40:17.000000000 -0400
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/DrawManager.cpp 2009-06-10 17:48:18.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2009-06-10 17:48:32.000000000 -0400
@@ -517,7 +517,7 @@
node->scale(radius/50.0,radius/50.0,radius/50.0);
node->translate(p[0],p[1],p[2]);
@@ -44,8 +53,8 @@
#endif
}
diff -urNad sofa-framework-1.0~beta4~/sofa-default.cfg sofa-framework-1.0~beta4/sofa-default.cfg
---- sofa-framework-1.0~beta4~/sofa-default.cfg 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa-default.cfg 2009-06-07 14:40:39.000000000 -0400
+--- sofa-framework-1.0~beta4~/sofa-default.cfg 2009-06-10 17:48:18.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa-default.cfg 2009-06-10 17:48:32.000000000 -0400
@@ -47,7 +47,7 @@
# DEFINES += SOFA_HAVE_FLOWVR
@@ -96,8 +105,8 @@
# Uncomment if you want debug symbols even in release build
# QMAKE_CXXFLAGS += -g
diff -urNad sofa-framework-1.0~beta4~/sofa.cfg sofa-framework-1.0~beta4/sofa.cfg
---- sofa-framework-1.0~beta4~/sofa.cfg 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa.cfg 2009-06-07 14:40:17.000000000 -0400
+--- sofa-framework-1.0~beta4~/sofa.cfg 2009-06-10 17:48:18.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa.cfg 2009-06-10 17:48:32.000000000 -0400
@@ -19,7 +19,8 @@
# Auto-detect Qt 4.x
@@ -143,6 +152,18 @@
}else{
# use miniBoost headers included in extlibs
INCLUDEPATH *= $$SOFA_DIR/extlibs/miniBoost
+@@ -251,9 +254,9 @@
+ # CSPARSE
+ ########################################################################
+ contains(DEFINES,SOFA_HAVE_CSPARSE){
+- SOFA_EXT_LIBS *= -lcsparse$$LIBSUFFIX
++ SOFA_EXT_LIBS *= -lcsparse
+ # use csparse headers included in extlibs
+- INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
++ # INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
+ }
+
+ ########################################################################
@@ -322,8 +325,8 @@
# NewMAT
########################################################################
Added: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch 2009-06-10 22:06:46 UTC (rev 3480)
@@ -0,0 +1,33 @@
+#! /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 and ARM (sqrt/sqrtl)
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/rmath.h sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/rmath.h 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h 2009-06-09 21:11:24.000000000 -0400
+@@ -132,8 +132,8 @@
+
+ inline double rsqrt(const double& a)
+ {
+-#if defined(__GNUC__)
+- return sqrt(a);
++#if defined(__arm__) || defined(__mips__)
++ 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__)
++ return (long double)sqrt((double)a);
++#else
+ return sqrtl(a);
++#endif
+ }
+
+ template<class T>
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch 2009-06-10 22:06:46 UTC (rev 3480)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 78_atomicity.dpatch by <domibel at t500lenny>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix: error: bits/atomicity.h: No such file or directory
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/system/atomic.h sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/system/atomic.h 2009-06-09 20:42:35.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h 2009-06-09 20:53:53.000000000 -0400
+@@ -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>
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the debian-med-commit
mailing list