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

[ehermann-guest at alioth.debian.org]

Author: ehermann-guest
Date: 2008-11-16 19:48:03 +0000 (Sun, 16 Nov 2008)
New Revision: 2694

Modified:
   trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch
   trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
Log:
FIX segmentation fault when using ogre


Modified: trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch	2008-11-16 19:46:23 UTC (rev 2693)
+++ trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch	2008-11-16 19:48:03 UTC (rev 2694)
@@ -5,9 +5,18 @@
 ## DP: fix: segfault on amd64 + qt4
 
 @DPATCH@
-diff -urNad sofa-framework-1.0.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp sofa-framework-1.0.0~beta3/applications/sofa/gui/qt/RealGUI.cpp
---- sofa-framework-1.0.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp	2008-08-13 17:24:36.000000000 +0200
-+++ sofa-framework-1.0.0~beta3/applications/sofa/gui/qt/RealGUI.cpp	2008-10-30 19:37:15.000000000 +0100
+diff -urNad sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp
+--- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp	2008-11-16 20:22:30.000000000 +0100
++++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp	2008-11-16 20:30:28.000000000 +0100
+@@ -180,7 +180,7 @@
+ class QSOFAApplication : public QApplication
+ {
+ public:
+-    QSOFAApplication(int argc, char ** argv)
++    QSOFAApplication(int &argc, char ** argv)
+     : QApplication(argc,argv)
+     {
+     }
 @@ -206,10 +206,10 @@
        {
  	{

Modified: trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch	2008-11-16 19:46:23 UTC (rev 2693)
+++ trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch	2008-11-16 19:48:03 UTC (rev 2694)
@@ -6,9 +6,17 @@
 
 @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-14 23:01:31.000000000 +0000
-+++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp	2008-11-14 23:01:38.000000000 +0000
-@@ -323,8 +323,8 @@
+--- 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 @@
  
  
  
@@ -20,8 +28,8 @@
  // 	    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-14 23:01:31.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa-default.cfg	2008-11-14 23:01:38.000000000 +0000
+--- 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
  
@@ -59,8 +67,8 @@
  # 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-14 23:01:38.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa.cfg	2008-11-14 23:01:38.000000000 +0000
+--- 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