r12587 - in packages/trunk/funguloids/debian: . patches

[Paul Wise]

Author: pabs
Date: 2011-08-13 13:47:57 +0000 (Sat, 13 Aug 2011)
New Revision: 12587

Added:
   packages/trunk/funguloids/debian/patches/optional_cg.patch
Modified:
   packages/trunk/funguloids/debian/changelog
   packages/trunk/funguloids/debian/patches/series
Log:
Add the OpenSUSE patch to make it optional 

Modified: packages/trunk/funguloids/debian/changelog
===================================================================
--- packages/trunk/funguloids/debian/changelog	2011-08-13 13:13:22 UTC (rev 12586)
+++ packages/trunk/funguloids/debian/changelog	2011-08-13 13:47:57 UTC (rev 12587)
@@ -8,6 +8,7 @@
   * Fix FTBFS due to newer GCC (Closes: #633297)
   * Drop use of ogre-plugins-cgprogrammanager and move the
     package to main instead of contrib.
+    - Add the OpenSUSE patch to make it optional 
 
  -- Paul Wise <pabs at debian.org>  Sat, 02 Apr 2011 13:12:20 +0800
 

Added: packages/trunk/funguloids/debian/patches/optional_cg.patch
===================================================================
--- packages/trunk/funguloids/debian/patches/optional_cg.patch	                        (rev 0)
+++ packages/trunk/funguloids/debian/patches/optional_cg.patch	2011-08-13 13:47:57 UTC (rev 12587)
@@ -0,0 +1,34 @@
+--- a/bin/plugins.cfg.in
++++ b/bin/plugins.cfg.in
+@@ -7,6 +7,6 @@
+ Plugin=RenderSystem_GL
+ Plugin=Plugin_ParticleFX
+ Plugin=Plugin_OctreeSceneManager
+-Plugin=Plugin_CgProgramManager
++#Plugin=Plugin_CgProgramManager
+ 
+ 
+--- a/src/ogreapp.cpp
++++ b/src/ogreapp.cpp
+@@ -23,6 +23,7 @@
+ //
+ //***************************************************************************/
+ 
++#include <sys/stat.h>
+ #include "ogreapp.h"
+ #include "objectsystem.h"
+ #include "effects.h"
+@@ -71,6 +72,13 @@
+ 			OGRE_CONFIG_AND_LOG_PATH + "Ogre.log"
+ 			);
+ 
++	ConfigFile cfg;
++	cfg.load(String(OGRE_PLUGINS_AND_RESOURCES_PATH) + "plugins.cfg");
++	String pluginDir = cfg.getSetting("PluginFolder");
++	struct stat sb;
++	if (stat((pluginDir + "Plugin_CgProgramManager.so").c_str(), &sb) == 0)
++		mRoot->loadPlugin(pluginDir + "Plugin_CgProgramManager");
++
+ 	// Random seed
+ 	srand(time(NULL));
+ 

Modified: packages/trunk/funguloids/debian/patches/series
===================================================================
--- packages/trunk/funguloids/debian/patches/series	2011-08-13 13:13:22 UTC (rev 12586)
+++ packages/trunk/funguloids/debian/patches/series	2011-08-13 13:47:57 UTC (rev 12587)
@@ -5,3 +5,4 @@
 g++4.3_fix.patch
 ogre-1.6.1.patch
 g++4.6.patch
+optional_cg.patch