summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2018-07-27 19:25:51 +0200
committerSven Eden <sven.eden@gmx.de>2018-07-27 19:25:51 +0200
commit57096140e55b66d94644d65c9cb8c759a8eaae2a (patch)
tree568cb2b7e31081531bf404aefef41cbcfa265cef
parentdev-games/ogre : Fix all issues reported by repoman. (diff)
downloadseden-57096140e55b66d94644d65c9cb8c759a8eaae2a.tar.gz
seden-57096140e55b66d94644d65c9cb8c759a8eaae2a.tar.bz2
seden-57096140e55b66d94644d65c9cb8c759a8eaae2a.zip
dev-games/ogre-2.1 : Fixed a type in the config loader patch.
-rw-r--r--dev-games/ogre/Ogre.log36
-rw-r--r--dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch4
2 files changed, 2 insertions, 38 deletions
diff --git a/dev-games/ogre/Ogre.log b/dev-games/ogre/Ogre.log
deleted file mode 100644
index dcd5082..0000000
--- a/dev-games/ogre/Ogre.log
+++ /dev/null
@@ -1,36 +0,0 @@
-08:23:45: Creating resource group General
-08:23:45: Creating resource group Internal
-08:23:45: Creating resource group Autodetect
-08:23:45: SceneManagerFactory for type 'DefaultSceneManager' registered.
-08:23:45: Registering ResourceManager for type Material
-08:23:45: Registering ResourceManager for type Mesh
-08:23:45: Registering ResourceManager for type Mesh2
-08:23:45: Registering ResourceManager for type OldSkeleton
-08:23:45: MovableObjectFactory for type 'ParticleSystem' registered.
-08:23:45: ArchiveFactory for archive type FileSystem registered.
-08:23:45: ArchiveFactory for archive type Zip registered.
-08:23:45: ArchiveFactory for archive type EmbeddedZip registered.
-08:23:45: DDS codec registering
-08:23:45: FreeImage version: 3.15.4
-08:23:45: This program uses FreeImage, a free, open source image library supporting all common bitmap formats. See http://freeimage.sourceforge.net for details
-08:23:45: Supported formats: bmp,ico,jpg,jif,jpeg,jpe,jng,koa,iff,lbm,mng,pbm,pbm,pcd,pcx,pgm,pgm,png,ppm,ppm,ras,tga,targa,tif,tiff,wap,wbmp,wbm,psd,cut,xbm,xpm,gif,hdr,g3,sgi,pfm,pct,pict,pic
-08:23:45: ETC codec registering
-08:23:45: OITD codec registering
-08:23:45: Registering ResourceManager for type HighLevelGpuProgram
-08:23:45: MovableObjectFactory for type 'Entity' registered.
-08:23:45: MovableObjectFactory for type 'Item' registered.
-08:23:45: MovableObjectFactory for type 'Light' registered.
-08:23:45: MovableObjectFactory for type 'BillboardSet' registered.
-08:23:45: MovableObjectFactory for type 'ManualObject2' registered.
-08:23:45: MovableObjectFactory for type 'BillboardChain' registered.
-08:23:45: MovableObjectFactory for type 'RibbonTrail' registered.
-08:23:45: MovableObjectFactory for type 'WireAabb' registered.
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): './plugins.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): '/etc/OGHRE/./plugins.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): '/usr/share/OGHRE/./plugins.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
-08:23:45: ./plugins.cfg not found, automatic plugin loading disabled.
-08:23:45: *-*-* OGRE Initialising
-08:23:45: *-*-* Version 2.1.0unstable ('B')
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): './ogre.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): '/etc/OGHRE/./ogre.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
-08:23:45: OGRE EXCEPTION(6:FileNotFoundException): '/usr/share/OGHRE/./ogre.cfg' file not found! in ConfigFile::load at /home/portage/dev-games/ogre-2.1-r20180723/work/ogre-2.1/OgreMain/src/OgreConfigFile.cpp (line 105)
diff --git a/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
index ee94461..365aa7c 100644
--- a/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
+++ b/dev-games/ogre/files/ogre-2.1-enhance_config_loading.patch
@@ -11,12 +11,12 @@
+ } catch (Exception &e) {
+ // Try /etc/OGRE/<file> next
+ try {
-+ loadDirect("/etc/OGHRE/" + filename, separators, trimWhitespace);
++ loadDirect("/etc/OGRE/" + filename, separators, trimWhitespace);
+ return;
+ } catch (...) { /* was just a test */ }
+ // Try /usr/share/OGRE/<file> last
+ try {
-+ loadDirect("/usr/share/OGHRE/" + filename, separators, trimWhitespace);
++ loadDirect("/usr/share/OGRE/" + filename, separators, trimWhitespace);
+ return;
+ } catch (...) { /* was just a test */ }
+ /* dammit... */