[ogre] Grab missed patch file change

Bruno Wolff III bruno at fedoraproject.org
Sat Apr 20 11:17:23 UTC 2013


commit 7444eec9ad25e6e96e88e5286a2e1bb76c084d47
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Apr 20 06:16:37 2013 -0500

    Grab missed patch file change
    
    This was supposed to be in the previous commit.

 ogre-1.8.1-dynlib-allow-no-so.patch |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ogre-1.8.1-dynlib-allow-no-so.patch b/ogre-1.8.1-dynlib-allow-no-so.patch
index 2896156..582a2bb 100644
--- a/ogre-1.8.1-dynlib-allow-no-so.patch
+++ b/ogre-1.8.1-dynlib-allow-no-so.patch
@@ -1,5 +1,5 @@
 --- OgreMain/src/OgreDynLib.cpp.orig	2013-04-20 05:28:11.276661686 -0500
-+++ OgreMain/src/OgreDynLib.cpp	2013-04-20 05:30:48.945700610 -0500
++++ OgreMain/src/OgreDynLib.cpp	2013-04-20 06:08:16.392339521 -0500
 @@ -71,7 +71,9 @@
  		String name = mName;
  #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_NACL
@@ -11,3 +11,12 @@
             name += ".so";
  #elif OGRE_PLATFORM == OGRE_PLATFORM_APPLE
          // dlopen() does not add .dylib to the filename, like windows does for .dll
+@@ -83,7 +85,7 @@
+ 		if (name.substr(name.length() - 4, 4) != ".dll")
+ 			name += ".dll";
+ #endif
+-        mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() );
++        if ( !mInst ) mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() );
+ 
+         if( !mInst )
+             OGRE_EXCEPT(


More information about the scm-commits mailing list