[med-svn] r3470 - in trunk/packages/sofa-framework/trunk/debian: . patches
Dominique Belhachemi
domibel-guest at alioth.debian.org
Sun Jun 7 21:21:36 UTC 2009
Author: domibel-guest
Date: 2009-06-07 21:21:36 +0000 (Sun, 07 Jun 2009)
New Revision: 3470
Added:
trunk/packages/sofa-framework/trunk/debian/index.html
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch
Modified:
trunk/packages/sofa-framework/trunk/debian/Notes
trunk/packages/sofa-framework/trunk/debian/README.Debian
trunk/packages/sofa-framework/trunk/debian/changelog
trunk/packages/sofa-framework/trunk/debian/control
trunk/packages/sofa-framework/trunk/debian/copyright
trunk/packages/sofa-framework/trunk/debian/get-orig-source
trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
trunk/packages/sofa-framework/trunk/debian/patches/00list
trunk/packages/sofa-framework/trunk/debian/rules
trunk/packages/sofa-framework/trunk/debian/sofa.1
Log:
Qt OGRE 3D viewer disabled
Modified: trunk/packages/sofa-framework/trunk/debian/Notes
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/Notes 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/Notes 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,9 +1,6 @@
1)
-grep -r "1.0 beta 1" .
-./modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.cpp:* SOFA, Simulation Open-Framework Architecture,
-version 1.0 beta 1 *
-./modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h:* SOFA, Simulation Open-Framework Architecture,
-version 1.0 beta 1 *
+$ grep -r "1.0 beta 3" .
+./modules/sofa/component/topology/ManifoldTriangleSetTopologyAlgorithms.h: * SOFA, Simulation Open-Framework Architecture, version 1.0 beta 3 *
2)
@@ -35,3 +32,24 @@
8)
update "man page", update "sofa -h" because
"sofa myscene.scn" works, but it is not documented
+
+9) libogre-dev (>= 1.6.0) because of removed Entity::setNormaliseNormals
+
+ * By default now, renormalisation of normals is automatic if there is a non-unit scale on the main
+ world matrix rather than the Entity::setNormaliseNormals option. If the user wants to optimise
+ this, they can prevent the SceneManager doing it in all cases by calling
+ SceneManager::setNormaliseNormalsOnScale(false) and then explicitly enabling the option per Pass
+ instead. In the case of an array of world matrices being used, if the first world matrix isn't a
+ guide then the shader writer should handle the renormalisation.
+
+
+10) doesn't work
+# Uncomment if you want to use LibXML instead of built-in TinyXML
+# DEFINES += SOFA_XML_PARSER_LIBXML
+
+./applications/sofa/gui/qt/GraphVisitor.h contains
+ //Tinyxml library
+ #include <tinyxml.h>
+ #include <tinystr.h>
+
+
Modified: trunk/packages/sofa-framework/trunk/debian/README.Debian
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/README.Debian 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/README.Debian 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,7 +1,6 @@
sofa-framework for Debian
-------------------------
-
-
+beta3:
Project MESSAGE: ====== SOFA Build Configuration ======
Project MESSAGE: | Platform: Linux/Unix
Project MESSAGE: | Mode: RELEASE
@@ -18,5 +17,29 @@
Project MESSAGE: | - Qt OGRE 3D viewer: ENABLED
Project MESSAGE: ======================================
+beta4:
+Project MESSAGE: ====== SOFA Build Configuration ======
+Project MESSAGE: | Platform: Linux/Unix
+Project MESSAGE: | Mode: RELEASE with debug symbols
+Project MESSAGE: | Qt version: 4.x
+Project MESSAGE: | RDTSC timer: DISABLED
+Project MESSAGE: | BOOST libraries: ENABLED
+Project MESSAGE: | TinyXML parser: ENABLED
+Project MESSAGE: | LibXML parser: DISABLED
+Project MESSAGE: | PNG support: ENABLED
+Project MESSAGE: | OpenGL Extensions support using GLEW: ENABLED
+Project MESSAGE: | GPU support using CUDA: DISABLED
+Project MESSAGE: | PML/LML support: ENABLED
+Project MESSAGE: | CSPARSE library : ENABLED
+Project MESSAGE: | METIS library : DISABLED
+Project MESSAGE: | TAUCS library : DISABLED
+Project MESSAGE: | GLUT GUI: ENABLED
+Project MESSAGE: | Qt GUI: ENABLED
+Project MESSAGE: | - Qt OpenGL viewer: ENABLED
+Project MESSAGE: | - Qt QGLViewer viewer: DISABLED
+Project MESSAGE: | - Qt OGRE 3D viewer: ENABLED
+Project MESSAGE: ======================================
+
+
-- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 16 Feb 2008 10:26:03 +0100
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,8 +1,11 @@
-sofa-framework (1.0~beta4-1) UNRELEASED; urgency=low
+sofa-framework (1.0~beta4-1) unstable; urgency=low
- * new upstream version
+ * new upstream release
+ * 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)
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 25 Mar 2009 19:11:06 +0000
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sun, 07 Jun 2009 14:35:15 -0400
sofa-framework (1.0~beta3-5) unstable; urgency=low
Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/control 2009-06-07 21:21:36 UTC (rev 3470)
@@ -4,10 +4,9 @@
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, libxml2-dev, freeglut3-dev, libnewmat10-dev,
- libfltk1.1-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev,
- libboost-graph-dev, libqwt5-qt4-dev, libpng-dev, libogre-dev, libqglviewer-qt4-dev,
- libboost-thread1.38-dev
+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
Build-Depends-Indep: doxygen, graphviz
Standards-Version: 3.8.1
Homepage: http://www.sofa-framework.org/
@@ -86,7 +85,7 @@
Package: sofa-doc
Section: doc
Architecture: all
-Description: SOFA class reference documentation
+Description: SOFA class reference documentation
SOFA is an Open Source framework primarily targeted at
real-time simulation, with an emphasis on medical simulation.
It is mostly intended for the research community to help
Modified: trunk/packages/sofa-framework/trunk/debian/copyright
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/copyright 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/copyright 2009-06-07 21:21:36 UTC (rev 3470)
@@ -4,46 +4,73 @@
Original-Source: http://www.sofa-framework.org/
Files: framework/*
-Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS
License: LGPL-2.1+
- see `/usr/share/common-licenses/LGPL'
+ see `/usr/share/common-licenses/LGPL-2.1'
Files: modules/*
-Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS
License: LGPL-2.1+
- see `/usr/share/common-licenses/LGPL'
+ see `/usr/share/common-licenses/LGPL-2.1'
Files: applications/*
-Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS
License: GPL-2+
- see `/usr/share/common-licenses/GPL'
+ see `/usr/share/common-licenses/GPL-2'
Files: extlibs/LML/*
-Copyright: (c)
+Copyright: 2003 TIMC (Emmanuel Promayon)
License: GPL-2+
- see `/usr/share/common-licenses/GPL'
+ see `/usr/share/common-licenses/GPL-2'
Files: extlibs/miniFlowVR/*
-Copyright: (c) 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
+Copyright: 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
License: LGPL
see `/usr/share/common-licenses/LGPL'
Files: extlibs/miniFlowVR/src/librender/*
-Copyright: (c) 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
+Copyright: 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
License: GPL
see `/usr/share/common-licenses/GPL'
Files: extlibs/PML/*
-Copyright: (c)
+Copyright: 2001 TIMC (Emmanuel Promayon, Matthieu Chabanas)
License: GPL-2+
- see `/usr/share/common-licenses/GPL'
+ see `/usr/share/common-licenses/GPL-2'
+Files: extlibs/csparse/*
+Copyright: 2006, Timothy A. Davis.
+License: LGPL-2.1+
+ see `/usr/share/common-licenses/LGPL-2.1'
+
+Files: extlibs/tinyxml/*
+Copyright: 2000-2006 Lee Thomason (www.grinninglizard.com)
+License: ZLIB
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any
+ purpose, including commercial applications, and to alter it and
+ redistribute it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product documentation
+ would be appreciated but is not required.
+ .
+ 2. Altered source versions must be plainly marked as such, and
+ must not be misrepresented as being the original software.
+ .
+ 3. This notice may not be removed or altered from any source
+ distribution.
+
Files: *
-Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+Copyright: 2006-2008 MGH, INRIA, USTL, UJF, CNRS
License: LGPL
see `/usr/share/common-licenses/LGPL'
Files: debian/*
Copyright: 2008, Dominique Belhachemi <domibel at cs.tu-berlin.de>
License: GPL-2+
- The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL'
+ The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'
Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-06-07 21:21:36 UTC (rev 3470)
@@ -19,8 +19,9 @@
rm -rf extlibs/libQGLViewer # libqglviewer-dev
rm -rf extlibs/qwt # libqwt-dev
rm -rf extlibs/newmat # libnewmat10-dev
+
# the external libraries are still there:
-# csparse LML miniFlowVR PML tinyxml
+# csparse LML miniFlowVR PML tinyxml
cd ..
Added: trunk/packages/sofa-framework/trunk/debian/index.html
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/index.html (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/index.html 2009-06-07 21:21:36 UTC (rev 3470)
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+<title>Sofa API Documentation</title></head>
+
+
+<frameset rows="200,*">
+ <frame src="http://www.sofa-framework.org/documentation?top=1" name="topfrm">
+ <frameset cols="220,*">
+ <frame src="http://www.sofa-framework.org/sofa/doc/doxygen/html/tree.html" name="treefrm">
+ <frame src="http://www.sofa-framework.org/sofa/doc/doxygen/html/main.html" name="basefrm"> </frameset>
+ <noframes>
+ <body><a href="http://www.sofa-framework.org/sofa/doc/doxygen/html/main.html">Frames are disabled. Click here to go to the main page.</a></body>
+ </noframes>
+
+</frameset>
+</html>
Modified: trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1 +1 @@
-libsofa1: package-name-doesnt-match-sonames libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1
+libsofa1: package-name-doesnt-match-sonames libcsparse1 libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacomponentbase1 libsofacomponentbehaviormodel1 libsofacomponentcollision1 libsofacomponentconstraint1 libsofacomponentcontextobject1 libsofacomponentcontroller1 libsofacomponentengine1 libsofacomponentfem1 libsofacomponentforcefield1 libsofacomponentinteractionforcefield1 libsofacomponentlinearsolver1 libsofacomponentmapping1 libsofacomponentmass1 libsofacomponentmastersolver1 libsofacomponentmisc1 libsofacomponentodesolver1 libsofacomponentvisualmodel1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1 libtinyxml1
Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,5 +1 @@
-#25_newmat.dpatch
-#10changes.dpatch
-#44_ogre.dpatch
-#55_fix_mips_sqrt.dpatch
-07_all_patches.dpatch
+50_all_changes.dpatch
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,154 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10changes.dpatch by <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: small changes
-
- at DPATCH@
-diff -urNad sofa-1.0.2~/Sofa.pro sofa-1.0.2/Sofa.pro
---- sofa-1.0.2~/Sofa.pro 2008-02-16 23:18:50.000000000 +0100
-+++ sofa-1.0.2/Sofa.pro 2008-02-16 23:19:45.000000000 +0100
-@@ -3,7 +3,6 @@
-
- include($$SOFA_DIR/sofa.cfg)
-
--SUBDIRS += extlibs/NewMAT
- SUBDIRS += framework
- SUBDIRS += modules
- SUBDIRS += applications
-diff -urNad sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h
---- sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:18:50.000000000 +0100
-+++ sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:19:45.000000000 +0100
-@@ -28,7 +28,7 @@
- #include <sofa/defaulttype/SofaBaseMatrix.h>
- #include "NewMatSofaVector.h"
-
--#include "NewMAT/newmat.h"
-+#include <newmat/newmat.h>
- #include <iostream>
-
- namespace sofa
-@@ -43,7 +43,7 @@
-
- NewMatSofaMatrix()
- {
-- impl = new NewMAT::Matrix;
-+ impl = new NEWMAT::Matrix;
- resVect = new NewMatSofaVector;
- opVect = new NewMatSofaVector;
- }
-@@ -111,7 +111,7 @@
- };
-
- private:
-- NewMAT::Matrix *impl;
-+ NEWMAT::Matrix *impl;
- };
-
-
-diff -urNad sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaVector.h sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaVector.h
---- sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaVector.h 2008-02-16 23:18:50.000000000 +0100
-+++ sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaVector.h 2008-02-16 23:19:45.000000000 +0100
-@@ -27,7 +27,7 @@
-
- #include <sofa/defaulttype/SofaBaseMatrix.h>
-
--#include "NewMAT/newmat.h"
-+#include <newmat/newmat.h>
-
- namespace sofa
- {
-@@ -43,7 +43,7 @@
-
- NewMatSofaVector()
- {
-- impl = new NewMAT::ColumnVector();
-+ impl = new NEWMAT::ColumnVector();
- }
-
- virtual ~NewMatSofaVector()
-@@ -68,7 +68,7 @@
- };
-
- private:
-- NewMAT::ColumnVector *impl;
-+ NEWMAT::ColumnVector *impl;
- };
-
- } // namespace defaulttype
-diff -urNad sofa-1.0.2~/framework/sofa/helper/gl/GLshader.cpp sofa-1.0.2/framework/sofa/helper/gl/GLshader.cpp
---- sofa-1.0.2~/framework/sofa/helper/gl/GLshader.cpp 2008-02-16 23:18:50.000000000 +0100
-+++ sofa-1.0.2/framework/sofa/helper/gl/GLshader.cpp 2008-02-16 23:19:45.000000000 +0100
-@@ -88,7 +88,7 @@
- #elif defined(__sgi) || defined(__sun)
- return dlGetProcAddress(name);
- #else /* __linux */
-- return (*glXGetProcAddressARB)((const GLubyte*)name);
-+ return (*glXGetProcAddress)((const GLubyte*)name);
- #endif
- }
-
-diff -urNad sofa-1.0.2~/sofa-local.cfg sofa-1.0.2/sofa-local.cfg
---- sofa-1.0.2~/sofa-local.cfg 1970-01-01 01:00:00.000000000 +0100
-+++ sofa-1.0.2/sofa-local.cfg 2008-02-16 23:20:26.000000000 +0100
-@@ -0,0 +1,39 @@
-+##################################
-+# SOFA COMPILATION CONFIGURATION #
-+##################################
-+# Copy to sofa-local.cfg and modify it to change local options
-+
-+# Uncomment if you want to compile Qt interface
-+DEFINES += SOFA_GUI_QT
-+
-+# Uncomment if you want to compile FLTK interface
-+# DEFINES += SOFA_GUI_FLTK
-+
-+# Uncomment if you want to use RTDSC processor cycle-counter for timing
-+# Note: this is the fastest and most precise method but have issues on
-+# multi-CPUs or with varying CPU frequencies
-+# DEFINES += SOFA_RDTSC
-+
-+# Uncomment if you want to use libPNG to read/write PNG images
-+DEFINES += SOFA_HAVE_PNG
-+
-+# Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
-+# DEFINES += SOFA_GPU_CUDA
-+
-+win32{
-+# CONFIG = debug_and_release
-+}
-+else{
-+ # Choose if you want to compile the debug or release version
-+ # CONFIG = debug
-+ CONFIG = release
-+
-+ # Uncomment if you want debug symbols even in release build
-+ # QMAKE_CXXFLAGS += -g
-+
-+ # Change to use different version of the compiler
-+ QMAKE_CC = gcc
-+ QMAKE_CXX = g++
-+ QMAKE_LINK = g++
-+ QMAKE_LINK_SHLIB = g++
-+}
-diff -urNad sofa-1.0.2~/sofa.cfg sofa-1.0.2/sofa.cfg
---- sofa-1.0.2~/sofa.cfg 2008-02-16 23:18:50.000000000 +0100
-+++ sofa-1.0.2/sofa.cfg 2008-02-16 23:19:45.000000000 +0100
-@@ -121,7 +121,7 @@
-
- INCLUDEPATH *= \
- $$SOFA_DIR/include \
-- $$SOFA_DIR/extlibs \
-+ /usr/include/libxml2 \
- $$SOFA_DIR/framework \
- $$SOFA_DIR/modules \
- $$SOFA_DIR/applications
-@@ -135,7 +135,7 @@
-
- # List of libs to link with
-
--SOFA_EXT_LIBS *= -lNewMAT$$LIBSUFFIX
-+SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
- win32 {
- SOFA_EXT_LIBS *= -llibxml2 -lGLaux -lglut32 -lcomctl32 -lopengl32 -lglu32 -lAdvAPI32 -lUser32 -lShell32 -lGdi32 -lWSock32 -lWS2_32 -lOle32
- }
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,454 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 25_newmat.dpatch by <domibel at sid1500>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Neccessary changes to use the libnewmat10-dev package
-
- at DPATCH@
-diff -urNad sofa-framework-1.0~beta3~/Sofa.pro sofa-framework-1.0~beta3/Sofa.pro
---- sofa-framework-1.0~beta3~/Sofa.pro 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/Sofa.pro 2008-11-14 13:12:28.000000000 +0000
-@@ -3,10 +3,10 @@
-
- include($${SOFA_DIR}/sofa.cfg)
-
--SUBDIRS += extlibs/NewMAT
-+#SUBDIRS += extlibs/NewMAT
-
-
--SUBDIRS += extlibs/qwt
-+#SUBDIRS += extlibs/qwt
-
- # FlowVR
- SUBDIRS += extlibs/miniFlowVR
-@@ -16,9 +16,9 @@
-
- #QGLViewer
-
--contains(DEFINES,SOFA_GUI_QGLVIEWER){
-- SUBDIRS += extlibs/libQGLViewer/QGLViewer
--}
-+#contains(DEFINES,SOFA_GUI_QGLVIEWER){
-+# SUBDIRS += extlibs/libQGLViewer/QGLViewer
-+#}
-
- # PML
- SUBDIRS += extlibs/PML
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h
---- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
-@@ -35,7 +35,7 @@
- #include <sofa/component/PoissonContainer.h>
- #include <sofa/component/LengthContainer.h>
- #include <sofa/component/RadiusContainer.h>
--#include "NewMAT/newmat.h"
-+#include <newmat/newmat.h>
-
-
-
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
---- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
-@@ -37,8 +37,8 @@
- #include <sofa/component/topology/TriangleData.h>
- #include <sofa/component/topology/EdgeData.h>
- #include <sofa/component/topology/PointData.h>
--#include <NewMAT/newmat.h>
--#include <NewMAT/newmatap.h>
-+#include <newmat/newmat.h>
-+#include <newmat/newmatap.h>
-
-
-
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
---- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp 2008-11-14 13:12:28.000000000 +0000
-@@ -498,13 +498,13 @@
- JtD[2] = Jt[2][0] * Depl[0] + Jt[2][1] * Depl[1] + Jt[2][2] * Depl[2] +
- Jt[2][3] * Depl[3] + Jt[2][4] * Depl[4] /* + Jt[2][5] * Depl[5] */ ;
-
-- NewMAT::SymmetricMatrix e(2);
-+ NEWMAT::SymmetricMatrix e(2);
- e = 0.0;
-
-- NewMAT::DiagonalMatrix D(2);
-+ NEWMAT::DiagonalMatrix D(2);
- D = 0.0;
-
-- NewMAT::Matrix V(2,2);
-+ NEWMAT::Matrix V(2,2);
- V = 0.0;
-
- e(1,1) = JtD[0];
-@@ -512,7 +512,7 @@
- e(2,1) = JtD[2];
- e(2,2) = JtD[1];
-
-- NewMAT::Jacobi(e, D, V);
-+ NEWMAT::Jacobi(e, D, V);
-
- v[0] = (Real)V(1,1);
- v[1] = (Real)V(2,1);
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h
---- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
-@@ -36,8 +36,8 @@
- #include <sofa/component/topology/TriangleData.h>
- #include <sofa/component/topology/EdgeData.h>
- #include <sofa/component/topology/PointData.h>
--#include <NewMAT/newmat.h>
--#include <NewMAT/newmatap.h>
-+#include <newmat/newmat.h>
-+#include <newmat/newmatap.h>
-
-
-
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h
---- sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h 2008-11-14 13:12:28.000000000 +0000
-@@ -47,9 +47,9 @@
- public:
- typedef Mat M;
- //typedef NewMAT::Matrix SubMatrixType;
-- typedef TNewMatMatrix<NewMAT::Matrix> SubMatrixType;
-- typedef TNewMatMatrix<NewMAT::Matrix> InvMatrixType;
-- typedef NewMAT::LinearEquationSolver LUSolver;
-+ typedef TNewMatMatrix<NEWMAT::Matrix> SubMatrixType;
-+ typedef TNewMatMatrix<NEWMAT::Matrix> InvMatrixType;
-+ typedef NEWMAT::LinearEquationSolver LUSolver;
- explicit TNewMatMatrix(int defaultBandWidth = 11)
- : bandWidth(defaultBandWidth)
- {
-@@ -177,7 +177,7 @@
- M::Column(1+i) = 0.0;
- }
-
-- NewMAT::GetSubMatrix sub(int i, int j, int nrow, int ncol)
-+ NEWMAT::GetSubMatrix sub(int i, int j, int nrow, int ncol)
- {
- return M::SubMatrix(i+1,i+nrow,j+1,j+ncol);
- }
-@@ -258,33 +258,33 @@
- int bandWidth;
- };
-
--typedef TNewMatMatrix<NewMAT::Matrix> NewMatMatrix;
--typedef TNewMatMatrix<NewMAT::SymmetricMatrix> NewMatSymmetricMatrix;
--typedef TNewMatMatrix<NewMAT::BandMatrix> NewMatBandMatrix;
--typedef TNewMatMatrix<NewMAT::SymmetricBandMatrix> NewMatSymmetricBandMatrix;
-+typedef TNewMatMatrix<NEWMAT::Matrix> NewMatMatrix;
-+typedef TNewMatMatrix<NEWMAT::SymmetricMatrix> NewMatSymmetricMatrix;
-+typedef TNewMatMatrix<NEWMAT::BandMatrix> NewMatBandMatrix;
-+typedef TNewMatMatrix<NEWMAT::SymmetricBandMatrix> NewMatSymmetricBandMatrix;
-
- template<>
--inline const char* TNewMatMatrix<NewMAT::Matrix>::Name() { return "NewMat"; }
-+inline const char* TNewMatMatrix<NEWMAT::Matrix>::Name() { return "NewMat"; }
-
- template<>
--inline const char* TNewMatMatrix<NewMAT::SymmetricMatrix>::Name() { return "NewMatSymmetric"; }
-+inline const char* TNewMatMatrix<NEWMAT::SymmetricMatrix>::Name() { return "NewMatSymmetric"; }
-
- template<>
--inline const char* TNewMatMatrix<NewMAT::BandMatrix>::Name() { return "NewMatBand"; }
-+inline const char* TNewMatMatrix<NEWMAT::BandMatrix>::Name() { return "NewMatBand"; }
-
- template<>
--inline const char* TNewMatMatrix<NewMAT::SymmetricBandMatrix>::Name() { return "NewMatSymmetricBand"; }
-+inline const char* TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::Name() { return "NewMatSymmetricBand"; }
-
- template<>
--inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::resize(int nbRow, int nbCol)
-+inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::resize(int nbRow, int nbCol)
- {
- if (nbCol != nbRow)
-- std::cerr << "ERROR: NewMAT::SymmetricMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
-+ std::cerr << "ERROR: NEWMAT::SymmetricMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
- M::ReSize(nbRow);
- }
-
- template<>
--inline void TNewMatMatrix<NewMAT::BandMatrix>::resize(int nbRow, int nbCol)
-+inline void TNewMatMatrix<NEWMAT::BandMatrix>::resize(int nbRow, int nbCol)
- {
- if (nbCol != nbRow)
- std::cerr << "ERROR: NewMAT::BandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
-@@ -292,15 +292,15 @@
- }
-
- template<>
--inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::resize(int nbRow, int nbCol)
-+inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::resize(int nbRow, int nbCol)
- {
- if (nbCol != nbRow)
-- std::cerr << "ERROR: NewMAT::SymmetricBandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
-+ std::cerr << "ERROR: NEWMAT::SymmetricBandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
- M::ReSize(nbRow, bandWidth);
- }
-
- template<>
--inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::set(int i, int j, double v)
-+inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::set(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
-@@ -317,7 +317,7 @@
- }
-
- template<>
--inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::add(int i, int j, double v)
-+inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::add(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
-@@ -334,7 +334,7 @@
- }
-
- template<>
--inline SReal TNewMatMatrix<NewMAT::BandMatrix>::element(int i, int j) const
-+inline SReal TNewMatMatrix<NEWMAT::BandMatrix>::element(int i, int j) const
- {
- #ifdef NEWMAT_CHECK
- if ((unsigned)i >= (unsigned)rowSize() || (unsigned)j >= (unsigned)colSize())
-@@ -351,7 +351,7 @@
-
-
- template<>
-- inline void TNewMatMatrix<NewMAT::BandMatrix>::set(int i, int j, double v)
-+ inline void TNewMatMatrix<NEWMAT::BandMatrix>::set(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
-@@ -372,7 +372,7 @@
- }
-
- template<>
-- inline void TNewMatMatrix<NewMAT::BandMatrix>::add(int i, int j, double v)
-+ inline void TNewMatMatrix<NEWMAT::BandMatrix>::add(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
-@@ -393,7 +393,7 @@
- }
-
- template<>
-- inline SReal TNewMatMatrix<NewMAT::SymmetricBandMatrix>::element(int i, int j) const
-+ inline SReal TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::element(int i, int j) const
- {
- #ifdef NEWMAT_CHECK
- if ((unsigned)i >= (unsigned)rowSize() || (unsigned)j >= (unsigned)colSize())
-@@ -409,7 +409,7 @@
- }
-
- template<>
-- inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::set(int i, int j, double v)
-+ inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::set(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
-@@ -431,7 +431,7 @@
- }
-
- template<>
-- inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::add(int i, int j, double v)
-+ inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::add(int i, int j, double v)
- {
- #ifdef NEWMAT_VERBOSE
- std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
-@@ -460,7 +460,7 @@
- {
-
- template<>
--class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >
-+class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >
- {
- public:
- Data<int> bandWidth;
-@@ -470,13 +470,13 @@
- };
-
- template<>
--inline component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
-+inline component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
- {
-- return new component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix>(this->data->bandWidth.getValue());
-+ return new component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix>(this->data->bandWidth.getValue());
- }
-
- template<>
--class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix> , component::linearsolver::NewMatVector >
-+class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix> , component::linearsolver::NewMatVector >
- {
- public:
- Data<int> bandWidth;
-@@ -486,9 +486,9 @@
- };
-
- template<>
--inline component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
-+inline component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
- {
-- return new component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix>(this->data->bandWidth.getValue());
-+ return new component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix>(this->data->bandWidth.getValue());
- }
-
-
-diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h
---- sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h 2008-11-14 13:12:28.000000000 +0000
-@@ -25,9 +25,9 @@
- #ifndef SOFA_COMPONENT_LINEARSOLVER_NEWMATVECTOR_H
- #define SOFA_COMPONENT_LINEARSOLVER_NEWMATVECTOR_H
-
--#include "NewMAT/newmat.h"
-+#include <newmat/newmat.h>
- #define WANT_STREAM
--#include "NewMAT/newmatio.h"
-+#include <newmat/newmatio.h>
- #include <sofa/defaulttype/BaseVector.h>
-
- namespace sofa
-@@ -39,11 +39,11 @@
- namespace linearsolver
- {
-
--class NewMatVector : public NewMAT::ColumnVector, public defaulttype::BaseVector
-+class NewMatVector : public NEWMAT::ColumnVector, public defaulttype::BaseVector
- {
- public:
-
-- typedef NewMAT::ColumnVector SubVector;
-+ typedef NEWMAT::ColumnVector SubVector;
-
- NewMatVector()
- {
-@@ -61,27 +61,27 @@
-
- virtual SReal element(int i) const
- {
-- return NewMAT::ColumnVector::element(i);
-+ return NEWMAT::ColumnVector::element(i);
- }
-
- void set(int i, SReal v)
- {
-- NewMAT::ColumnVector::element(i) = v;
-+ NEWMAT::ColumnVector::element(i) = v;
- }
-
- void add(int i, SReal v)
- {
-- NewMAT::ColumnVector::element(i) += v;
-+ NEWMAT::ColumnVector::element(i) += v;
- }
-
- SReal& operator[](int i)
- {
-- return NewMAT::ColumnVector::element(i);
-+ return NEWMAT::ColumnVector::element(i);
- }
-
- SReal operator[](int i) const
- {
-- return NewMAT::ColumnVector::element(i);
-+ return NEWMAT::ColumnVector::element(i);
- }
-
- int size() const
-@@ -89,21 +89,21 @@
- return Nrows();
- }
-
-- NewMAT::GetSubMatrix sub(int i, int n)
-+ NEWMAT::GetSubMatrix sub(int i, int n)
- {
-- return NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
-+ return NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
- }
-
- template<class T>
- void getsub(int i, int n, T& v)
- {
-- v = NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
-+ v = NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
- }
-
- template<class T>
- void setsub(int i, int n, const T& v)
- {
-- NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1) = v;
-+ NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1) = v;
- }
-
- /// v = 0
-@@ -131,7 +131,7 @@
- /// \return v.a
- double dot(const NewMatVector& a) const
- {
-- return NewMAT::DotProduct(*this,a);
-+ return NEWMAT::DotProduct(*this,a);
- }
-
- /// \return sqrt(v.v)
-@@ -143,7 +143,7 @@
- //void operator=(double f) { NewMAT::ColumnVector::operator=(f); }
-
- template<class T>
-- void operator=(const T& m) { NewMAT::ColumnVector::operator=(m); }
-+ void operator=(const T& m) { NEWMAT::ColumnVector::operator=(m); }
-
- friend std::ostream& operator << (std::ostream& out, const NewMatVector& v )
- {
-diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg
---- sofa-framework-1.0~beta3~/sofa.cfg 2008-11-14 13:12:24.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-14 13:12:48.000000000 +0000
-@@ -205,7 +205,12 @@
- $$SOFA_DIR/extlibs \
- $$SOFA_DIR/framework \
- $$SOFA_DIR/modules \
-- $$SOFA_DIR/applications
-+ $$SOFA_DIR/applications \
-+ /usr/include/qwt \
-+ /usr/include/qt4 \
-+ /usr/include/qwt-qt4
-+
-+
-
- DEPENDPATH *= \
- $$SOFA_DIR/framework \
-@@ -220,7 +225,7 @@
-
- # List of libs to link with
-
--SOFA_EXT_LIBS *= -lNewMAT$$LIBSUFFIX
-+SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
-
-
- win32 {
-@@ -293,7 +298,7 @@
- QT += opengl
- }
- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
- }
-
- ########################################################################
-@@ -316,7 +321,7 @@
- unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
- win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
- }
-
- ########################################################################
-@@ -345,7 +350,7 @@
- LIBS += OgreMain.lib
- }
- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
- }
-
- ########################################################################
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch 2009-06-07 21:21:36 UTC (rev 3470)
@@ -1,85 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 44_ogre.dpatch by <domibel at ve2056622895.ihrserver.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable OGRE, PNG, PML, LML
-
- at DPATCH@
-diff -urNad sofa-framework-1.0~beta3~/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp
---- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-16 20:22:30.000000000 +0100
-+++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-16 20:28:15.000000000 +0100
-@@ -237,6 +237,7 @@
- #endif
- mRoot = new Ogre::Root(pluginsPath, ogrePath, ogreLog);
- Ogre::LogManager::getSingleton().setLogDetail(Ogre::LL_LOW);
-+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation("/","FileSystem","General");
- Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/textures","FileSystem","General");
- Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/materials","FileSystem","General");
- Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/shaders","FileSystem","General");
-@@ -323,8 +324,8 @@
-
-
-
-- Display* display = qt_xdisplay(); //XOpenDisplay(NULL);
-- int screen = qt_xscreen(); //DefaultScreen(display);
-+ Display* display = XOpenDisplay(NULL);
-+ int screen = DefaultScreen(display);
-
- // params["parentWindowHandle"] =
- // Ogre::StringConverter::toString ((unsigned long)display) +
-diff -urNad sofa-framework-1.0~beta3~/sofa-default.cfg sofa-framework-1.0~beta3/sofa-default.cfg
---- sofa-framework-1.0~beta3~/sofa-default.cfg 2008-11-16 20:22:30.000000000 +0100
-+++ sofa-framework-1.0~beta3/sofa-default.cfg 2008-11-16 20:27:48.000000000 +0100
-@@ -20,7 +20,7 @@
- DEFINES += SOFA_GUI_QTVIEWER
-
- # Uncomment if you want to compile QTOgreViewer interface
--# DEFINES += SOFA_GUI_QTOGREVIEWER
-+ DEFINES += SOFA_GUI_QTOGREVIEWER
-
- # Uncomment if you want to compile QGLViewer interface
- # DEFINES += SOFA_GUI_QGLVIEWER
-@@ -38,7 +38,7 @@
- # DEFINES += SOFA_RDTSC
-
- # Uncomment if you want to use libPNG to read/write PNG images
--# DEFINES += SOFA_HAVE_PNG
-+ DEFINES += SOFA_HAVE_PNG
-
- # Uncomment if you want to use GLEW to handle OpenGL extensions
- DEFINES += SOFA_HAVE_GLEW
-@@ -52,7 +52,7 @@
- #CUDA_FLAGS += --ptxas-options=-v -arch sm_10
-
- # 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 MKL for Matrix Solvers
- #DEFINES += SOFA_HAVE_MKL
-@@ -62,7 +62,7 @@
- #DEFINES += SOFA_HAVE_SENSABLE
-
- # Uncomment if you want to use Sensable Phantom with CHAI3D
--# DEFINES += SOFA_HAVE_CHAI3D
-+# DEFINES += SOFA_HAVE_CHAI3D
-
- # Uncomment if you want to support moving frames when computing inertia forces in Mass
- # DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg
---- sofa-framework-1.0~beta3~/sofa.cfg 2008-11-16 20:27:47.000000000 +0100
-+++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-16 20:27:48.000000000 +0100
-@@ -349,8 +349,11 @@
-
- LIBS += OgreMain.lib
- }
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
-+ INCLUDEPATH += /usr/include/OGRE/
-+
-+ # $$LIBSUFFIX for the debug target not needed because we are using Debian libraries
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
-+ SOFA_GUI_EXT_LIBS *= -lOgreMain
- }
-
- ########################################################################
Added: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch 2009-06-07 21:21:36 UTC (rev 3470)
@@ -0,0 +1,193 @@
+#! /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-07 14:40:17.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
+@@ -28,7 +28,7 @@
+ #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-07 14:40:17.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-07 14:40:39.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
+@@ -86,7 +86,7 @@
+ # DEFINES += SOFA_XML_PARSER_LIBXML
+
+ # Uncomment if you want to use csparse
+-# DEFINES += SOFA_HAVE_CSPARSE
++ DEFINES += SOFA_HAVE_CSPARSE
+
+
+ # Uncomment if you want to use METIS
+@@ -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-07 14:40:17.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
+@@ -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
Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
___________________________________________________________________
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-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.dpatch 2009-06-07 21:21:36 UTC (rev 3470)
@@ -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~beta3~/framework/sofa/helper/rmath.h sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h
---- sofa-framework-1.0~beta3~/framework/sofa/helper/rmath.h 2008-08-12 08:53:41.000000000 +0000
-+++ sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h 2008-11-07 23:31:04.000000000 +0000
-@@ -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>
Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/rules 2009-06-07 21:21:36 UTC (rev 3470)
@@ -19,7 +19,8 @@
dh_testdir
# Add here commands to configure the package.
qmake
-
+ (cd applications/projects/runSofa; qmake -o Makefile runSofa.pro)
+
# create a folder without object files
cp -r $(CURDIR)/applications/tutorials $(CURDIR)/tutorials
@@ -34,7 +35,7 @@
# Create the documentation files
mkdir -p $(CURDIR)/doc/doxygen
- doxygen -u Doxyfile
+# doxygen -u Doxyfile
# doxygen
# remove zero byte files
@@ -59,6 +60,8 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp docs-stamp
+ rm -rf bin lib tutorials doc
+
# Add here commands to clean up after the build process.
# $(MAKE) clean
@@ -90,7 +93,9 @@
# Documentation
# dh_install -psofa-doc doc/doxygen/html usr/share/doc/sofa-doc
+ dh_install -psofa-doc debian/index.html usr/share/doc/sofa-doc/html
+
dh_installexamples
Modified: trunk/packages/sofa-framework/trunk/debian/sofa.1
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa.1 2009-06-06 17:56:10 UTC (rev 3469)
+++ trunk/packages/sofa-framework/trunk/debian/sofa.1 2009-06-07 21:21:36 UTC (rev 3470)
@@ -4,13 +4,19 @@
.SH "SYNOPSIS"
sofa [OPTIONS]
.SH "DESCRIPTION"
-SOFA is an Open Source framework primarily targeted at real\-time simulation, with an emphasis on medical simulation. It is mostly intended for the research community to help develop newer algorithms, but can also be used as an efficient prototyping tool. Based on an advanced software architecture, it allows to:
+SOFA is an Open Source framework primarily targeted at real\-time simulation, with an emphasis
+on medical simulation. It is mostly intended for the research community to help develop newer
+algorithms, but can also be used as an efficient prototyping tool. Based on an advanced software
+architecture, it allows to:
- * create complex and evolving simulations by combining new algorithms with algorithms already included in SOFA
- * modify most parameters of the simulation – deformable behavior, surface representation, solver, constraints, collision algorithm, etc. – by simply editing an XML file
+ * create complex and evolving simulations by combining new algorithms with algorithms
+ already included in SOFA
+ * modify most parameters of the simulation – deformable behavior, surface representation,
+ solver, constraints, collision algorithm, etc. – by simply editing an XML file
* build complex models from simpler ones using a scene\-graph description
* efficiently simulate the dynamics of interacting objects using abstract equation solvers
* reuse and easily compare a variety of available methods
+
.SH "OPTIONS"
.IP "\-h \-\-help"
this help
@@ -24,7 +30,8 @@
.IP "\-l \-\-load"
load given plugins (default: )
.SH "AUTHORS"
-SOFA is currently developed by 3 INRIA teams: Alcove, Evasion and Asclepios but the project also benefited from the help of the CIMIT Sim Group, ETH Zurich and CSIRO.
+SOFA is currently developed by 3 INRIA teams: Alcove, Evasion and Asclepios but the project also
+benefited from the help of the CIMIT Sim Group, ETH Zurich and CSIRO.
.SH "SEE ALSO"
The full documentation for
.B sofa
More information about the debian-med-commit
mailing list