[med-svn] r4438 - in trunk/packages/sofa-framework/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Mon Dec 7 01:26:45 UTC 2009
Author: domibel-guest
Date: 2009-12-07 01:26:44 +0000 (Mon, 07 Dec 2009)
New Revision: 4438
Added:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
trunk/packages/sofa-framework/trunk/debian/patches/series
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/00list
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.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/rules
Log:
added linker option --no-add-needed
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,11 +1,16 @@
sofa-framework (1.0~beta4-3) UNRELEASED; urgency=low
+ [Dominique Belhachemi]
+ * added linker option --no-add-needed (Closes: #556352)
+ libdl had to be added to the list of libraries
+ * switched from dpatch to quilt
+
[Andreas Tille]
* debian/control:
- Added missing Vcs tags
- Standards-Version: 3.8.3 (no changes)
- -- Andreas Tille <tille at debian.org> Fri, 04 Dec 2009 08:57:20 +0100
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 06 Dec 2009 20:18:59 -0500
sofa-framework (1.0~beta4-2) unstable; urgency=low
Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/control 2009-12-07 01:26:44 UTC (rev 4438)
@@ -4,7 +4,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), dpatch, freeglut3-dev, libnewmat10-dev,
+Build-Depends: debhelper (>= 7), quilt, 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
Build-Depends-Indep: doxygen, graphviz
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,4 +0,0 @@
-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.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff 2009-12-07 01:26:44 UTC (rev 4438)
@@ -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.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,73 +0,0 @@
-#! /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>
-
Added: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2009-12-07 01:26:44 UTC (rev 4438)
@@ -0,0 +1,228 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_all_changes.dpatch by <domibel at cs.tu-berlin.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link sofa to Debians newmat, boost, xml2 and qwt library.
+## DP: Use OGRE >= 1.6.0 if switched on.
+
+ at DPATCH@
+Index: sofa-framework-1.0~beta4/Sofa.pro
+===================================================================
+--- sofa-framework-1.0~beta4.orig/Sofa.pro 2009-12-06 14:20:24.000000000 -0500
++++ sofa-framework-1.0~beta4/Sofa.pro 2009-12-06 14:20:34.000000000 -0500
+@@ -3,10 +3,10 @@
+
+ include($${SOFA_DIR}/sofa.cfg)
+
+-SUBDIRS += extlibs/newmat
++#SUBDIRS += extlibs/newmat
+
+
+-SUBDIRS += extlibs/qwt
++#SUBDIRS += extlibs/qwt
+
+ contains(DEFINES,SOFA_XML_PARSER_TINYXML){
+ SUBDIRS += extlibs/tinyxml
+@@ -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){
+- SUBDIRS += extlibs/libQGLViewer/QGLViewer
++# SUBDIRS += extlibs/libQGLViewer/QGLViewer
+ }
+
+ # PML
+Index: sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/helper/gl/DrawManager.cpp 2009-12-06 14:20:24.000000000 -0500
++++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2009-12-06 14:20:34.000000000 -0500
+@@ -517,7 +517,7 @@
+ node->scale(radius/50.0,radius/50.0,radius/50.0);
+ node->translate(p[0],p[1],p[2]);
+ node->attachObject(sph);
+- sph->setNormaliseNormals(true);
++ //sph->setNormaliseNormals(true);
+ break;
+ #endif
+ }
+Index: sofa-framework-1.0~beta4/sofa-default.cfg
+===================================================================
+--- sofa-framework-1.0~beta4.orig/sofa-default.cfg 2009-12-06 14:20:24.000000000 -0500
++++ sofa-framework-1.0~beta4/sofa-default.cfg 2009-12-06 14:20:34.000000000 -0500
+@@ -47,7 +47,7 @@
+ # DEFINES += SOFA_HAVE_FLOWVR
+
+ # Uncomment if you want to use Boost lib for multithread computing
+-# DEFINES += SOFA_HAVE_BOOST
++ DEFINES += SOFA_HAVE_BOOST
+
+ # Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
+ # DEFINES += SOFA_GPU_CUDA
+@@ -61,10 +61,10 @@
+ # DEFINES += SOFA_GPU_CUDA_DOUBLE
+
+ # Uncomment if you want to use SofaPML to load PML and LML files
+-# DEFINES += SOFA_PML
++DEFINES += SOFA_PML
+
+ # Uncomment if you want to use LAPACK for Matrix Solvers
+-#DEFINES += SOFA_HAVE_LAPACK
++# DEFINES += SOFA_HAVE_LAPACK
+
+ # Uncomment if you want to use MKL for Matrix Solvers
+ #DEFINES += SOFA_HAVE_MKL
+@@ -77,7 +77,7 @@
+ # DEFINES += SOFA_HAVE_CHAI3D
+
+ # Uncomment if you want to support moving frames when computing inertia forces in Mass
+-# DEFINES += SOFA_SUPPORT_MOVING_FRAMES
++ DEFINES += SOFA_SUPPORT_MOVING_FRAMES
+
+ # Uncomment if you want to have the possibility to trave the visitor execution
+ DEFINES += DUMP_VISITOR_INFO
+@@ -110,6 +110,8 @@
+ # Choose if you want to compile the debug or release version
+ #CONFIG = debug
+ CONFIG = release
++QMAKE_CXXFLAGS += -W
++QMAKE_CFLAGS += -W
+
+ # Uncomment if you want debug symbols even in release build
+ # QMAKE_CXXFLAGS += -g
+Index: sofa-framework-1.0~beta4/sofa.cfg
+===================================================================
+--- sofa-framework-1.0~beta4.orig/sofa.cfg 2009-12-06 14:20:24.000000000 -0500
++++ sofa-framework-1.0~beta4/sofa.cfg 2009-12-06 14:22:48.000000000 -0500
+@@ -19,7 +19,8 @@
+
+ # Auto-detect Qt 4.x
+ # The QT variable was introduced in Qt 4
+-!isEmpty(QT): DEFINES += SOFA_QT4
++#!isEmpty(QT): DEFINES += SOFA_QT4
++DEFINES += SOFA_QT4
+
+ !include( sofa-local.cfg ) {
+ # Copy sofa-default.cfg to sofa-local.cfg and modify it to change local options
+@@ -197,12 +198,10 @@
+ OBJECTS_DIR = OBJ/$$join(CONFIGDEBUG,,,)
+
+ CONFIGLIBRARIES+= \
+- warn_on \
+ stl \
+ rtti \
+ thread
+
+-CONFIGPROJECT += warn_on
+ CONFIGPROJECTGUI = $$CONFIGPROJECT
+ CONFIGPROJECTCMD = $$CONFIGPROJECT
+ CONFIGPROJECTCMD += console
+@@ -211,7 +210,11 @@
+ $$SOFA_DIR/include \
+ $$SOFA_DIR/framework \
+ $$SOFA_DIR/modules \
+- $$SOFA_DIR/applications
++ $$SOFA_DIR/applications \
++ /usr/include/qt4 \
++ /usr/include/qwt-qt4
++
++
+
+ DEPENDPATH *= \
+ $$SOFA_DIR/framework \
+@@ -241,7 +244,7 @@
+ # BOOST
+ ########################################################################
+ contains(DEFINES,SOFA_HAVE_BOOST){
+- SOFA_EXT_LIBS *= -lboost_thread
++ SOFA_EXT_LIBS *= -lboost_thread-mt
+ }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
+ ########################################################################
+
+-INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
+-SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
++#INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
++SOFA_EXT_LIBS *= -lnewmat
+
+ ########################################################################
+ # METIS
+@@ -377,8 +380,9 @@
+ else {
+ QT += opengl
+ }
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
++# SOFA_GUI_EXT_LIBS *= -lqwt
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+ }
+
+ ########################################################################
+@@ -398,10 +402,10 @@
+ else {
+ QT += opengl
+ }
+- unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
++ unix:SOFA_GUI_EXT_LIBS *= -lqglviewer-qt4$${LIBSUFFIX}
+ win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++ INCLUDEPATH += /usr/include/qglviewer-qt4
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+ }
+
+ ########################################################################
+@@ -428,8 +432,8 @@
+ QMAKE_LIBDIR += $(OGRE_HOME)/lib
+ LIBS += OgreMain.lib
+ }
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+
+ unix {
+ macx: QMAKE_CXXFLAGS += -Wno-unused
+@@ -601,6 +605,9 @@
+
+ SOFA_GUI_LIBS *= -lsofagui$$LIBSUFFIX -lsofaguimain$$LIBSUFFIX
+
++# for binutils-gold
++SOFA_EXTRA_LIBS += -ldl
++
+ # When using staticlib, rebuild applications if a library has changed
+ contains(CONFIGLIBRARIES,staticlib){
+ contains(TEMPLATE,app){
+@@ -619,7 +626,7 @@
+ }
+ }
+
+-SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS}
++SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS} $${SOFA_EXTRA_LIBS}
+
+ SOFA_GUI_LIBS += $${SOFA_GUI_EXT_LIBS}
+
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,205 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_all_changes.dpatch by <domibel at cs.tu-berlin.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link sofa to Debians newmat, boost, xml2 and qwt library.
-## DP: Use OGRE >= 1.6.0 if switched on.
-
- at 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-10 19:06:32.000000000 -0400
-@@ -3,10 +3,10 @@
-
- include($${SOFA_DIR}/sofa.cfg)
-
--SUBDIRS += extlibs/newmat
-+#SUBDIRS += extlibs/newmat
-
-
--SUBDIRS += extlibs/qwt
-+#SUBDIRS += extlibs/qwt
-
- contains(DEFINES,SOFA_XML_PARSER_TINYXML){
- SUBDIRS += extlibs/tinyxml
-@@ -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){
-- SUBDIRS += extlibs/libQGLViewer/QGLViewer
-+# SUBDIRS += extlibs/libQGLViewer/QGLViewer
- }
-
- # 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-10 19:06: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]);
- node->attachObject(sph);
-- sph->setNormaliseNormals(true);
-+ //sph->setNormaliseNormals(true);
- break;
- #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-10 19:14:33.000000000 -0400
-@@ -47,7 +47,7 @@
- # DEFINES += SOFA_HAVE_FLOWVR
-
- # Uncomment if you want to use Boost lib for multithread computing
--# DEFINES += SOFA_HAVE_BOOST
-+ DEFINES += SOFA_HAVE_BOOST
-
- # Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
- # DEFINES += SOFA_GPU_CUDA
-@@ -61,10 +61,10 @@
- # DEFINES += SOFA_GPU_CUDA_DOUBLE
-
- # Uncomment if you want to use SofaPML to load PML and LML files
--# DEFINES += SOFA_PML
-+DEFINES += SOFA_PML
-
- # Uncomment if you want to use LAPACK for Matrix Solvers
--#DEFINES += SOFA_HAVE_LAPACK
-+# DEFINES += SOFA_HAVE_LAPACK
-
- # Uncomment if you want to use MKL for Matrix Solvers
- #DEFINES += SOFA_HAVE_MKL
-@@ -77,7 +77,7 @@
- # DEFINES += SOFA_HAVE_CHAI3D
-
- # Uncomment if you want to support moving frames when computing inertia forces in Mass
--# DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-+ DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-
- # Uncomment if you want to have the possibility to trave the visitor execution
- DEFINES += DUMP_VISITOR_INFO
-@@ -110,6 +110,8 @@
- # Choose if you want to compile the debug or release version
- #CONFIG = debug
- CONFIG = release
-+QMAKE_CXXFLAGS += -W
-+QMAKE_CFLAGS += -W
-
- # 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-10 19:06:32.000000000 -0400
-@@ -19,7 +19,8 @@
-
- # Auto-detect Qt 4.x
- # The QT variable was introduced in Qt 4
--!isEmpty(QT): DEFINES += SOFA_QT4
-+#!isEmpty(QT): DEFINES += SOFA_QT4
-+DEFINES += SOFA_QT4
-
- !include( sofa-local.cfg ) {
- # Copy sofa-default.cfg to sofa-local.cfg and modify it to change local options
-@@ -197,12 +198,10 @@
- OBJECTS_DIR = OBJ/$$join(CONFIGDEBUG,,,)
-
- CONFIGLIBRARIES+= \
-- warn_on \
- stl \
- rtti \
- thread
-
--CONFIGPROJECT += warn_on
- CONFIGPROJECTGUI = $$CONFIGPROJECT
- CONFIGPROJECTCMD = $$CONFIGPROJECT
- CONFIGPROJECTCMD += console
-@@ -211,7 +210,11 @@
- $$SOFA_DIR/include \
- $$SOFA_DIR/framework \
- $$SOFA_DIR/modules \
-- $$SOFA_DIR/applications
-+ $$SOFA_DIR/applications \
-+ /usr/include/qt4 \
-+ /usr/include/qwt-qt4
-+
-+
-
- DEPENDPATH *= \
- $$SOFA_DIR/framework \
-@@ -241,7 +244,7 @@
- # BOOST
- ########################################################################
- contains(DEFINES,SOFA_HAVE_BOOST){
-- SOFA_EXT_LIBS *= -lboost_thread
-+ SOFA_EXT_LIBS *= -lboost_thread-mt
- }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
- ########################################################################
-
--INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
--SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
-+#INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
-+SOFA_EXT_LIBS *= -lnewmat
-
- ########################################################################
- # METIS
-@@ -377,8 +380,9 @@
- else {
- QT += opengl
- }
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-+# SOFA_GUI_EXT_LIBS *= -lqwt
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
- }
-
- ########################################################################
-@@ -398,10 +402,10 @@
- else {
- QT += opengl
- }
-- unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
-+ unix:SOFA_GUI_EXT_LIBS *= -lqglviewer-qt4$${LIBSUFFIX}
- win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+ INCLUDEPATH += /usr/include/qglviewer-qt4
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
- }
-
- ########################################################################
-@@ -428,8 +432,8 @@
- QMAKE_LIBDIR += $(OGRE_HOME)/lib
- LIBS += OgreMain.lib
- }
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
-
- unix {
- macx: QMAKE_CXXFLAGS += -Wno-unused
Added: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff 2009-12-07 01:26:44 UTC (rev 4438)
@@ -0,0 +1,34 @@
+#! /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@
+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__)
++ 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.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,33 +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 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>
Added: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff 2009-12-07 01:26:44 UTC (rev 4438)
@@ -0,0 +1,25 @@
+#! /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@
+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>
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.dpatch 2009-12-07 01:26:44 UTC (rev 4438)
@@ -1,24 +0,0 @@
-#! /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>
Added: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series 2009-12-07 01:26:44 UTC (rev 4438)
@@ -0,0 +1,4 @@
+13_gcc4.4.diff
+50_all_changes.diff
+55_fix_mips_sqrt.diff
+78_atomicity.diff
Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules 2009-12-06 17:28:32 UTC (rev 4437)
+++ trunk/packages/sofa-framework/trunk/debian/rules 2009-12-07 01:26:44 UTC (rev 4438)
@@ -3,8 +3,8 @@
PACKAGE=sofa-framework
DEB_SOURCE_PACKAGE:=$(PACKAGE)
-# DPatch
-include /usr/share/dpatch/dpatch.make
+# quilt
+include /usr/share/quilt/quilt.make
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
@@ -13,9 +13,8 @@
get-orig-source:
. debian/get-orig-source
-
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add here commands to configure the package.
qmake
More information about the debian-med-commit
mailing list