diff options
Diffstat (limited to 'dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch')
| -rw-r--r-- | dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch | 150 |
1 files changed, 73 insertions, 77 deletions
diff --git a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch index 16fd448..c553ee2 100644 --- a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch +++ b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch @@ -1,52 +1,35 @@ -Index: bootstrap -=================================================================== ---- bootstrap (revision 417) -+++ bootstrap (working copy) -@@ -7,8 +7,8 @@ - # - libtool 1.4+ - - # Deal with some gentoo-specific issues --export WANT_AUTOMAKE='1.7' --export WANT_AUTOCONF='2.5' -+#export WANT_AUTOMAKE='1.7' -+#export WANT_AUTOCONF='2.5' - - ## Using prereq in autoconf rather than here, mostly for the debian systems at - ## this point -@@ -31,4 +31,9 @@ - rm -rf autom4te.cache - - # Fire up autotools --libtoolize --force --copy && aclocal -I scripts/m4 $ACLOCAL_FLAGS && autoheader && automake --include-deps --add-missing --foreign --copy && autoconf -+autoreconf -+libtoolize --force --copy -+aclocal -I scripts/m4 $ACLOCAL_FLAGS -+autoheader -+automake --include-deps --add-missing --foreign --copy -+autoconf -Index: configure.ac -=================================================================== ---- configure.ac (revision 417) -+++ configure.ac (working copy) -@@ -13,11 +13,12 @@ - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE - -+LT_INIT([dlopen,win32-dll]) -+ - # Checks for programs. - AC_ISC_POSIX - AC_PROG_CXX - AM_PROG_CC_STDC --AC_PROG_LIBTOOL - - # Checks for header files. - AC_HEADER_STDC -Index: src/IOgreCollisionShape.cpp -=================================================================== ---- src/IOgreCollisionShape.cpp (revision 417) -+++ src/IOgreCollisionShape.cpp (working copy) -@@ -264,7 +264,7 @@ +Index: configure.ac
+===================================================================
+--- configure.ac (revision 417)
++++ configure.ac (working copy)
+@@ -13,11 +13,12 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+
++LT_INIT([dlopen,win32-dll])
++
+ # Checks for programs.
+ AC_ISC_POSIX
+ AC_PROG_CXX
+ AM_PROG_CC_STDC
+-AC_PROG_LIBTOOL
+
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -35,7 +36,7 @@
+ # Checks for library functions.
+ AC_CHECK_FUNCS([floor memmove memset sqrt strchr strstr])
+
+-PKG_CHECK_MODULES(OGRE, [OGRE >= 1.0.0])
++PKG_CHECK_MODULES(OGRE, [OGRE >= 1.8.0])
+ AC_SUBST(OGRE_CFLAGS)
+ AC_SUBST(OGRE_LIBS)
+
+Index: src/IOgreCollisionShape.cpp
+===================================================================
+--- src/IOgreCollisionShape.cpp (revision 417)
++++ src/IOgreCollisionShape.cpp (working copy)
+@@ -264,7 +264,7 @@
if(!mHasCostumTransform)
{
getParentSceneNode()->_update(true, true);
@@ -55,11 +38,11 @@ Index: src/IOgreCollisionShape.cpp }
return mFullTransform;
}
-Index: src/OgreBoxCollisionShape.cpp -=================================================================== ---- src/OgreBoxCollisionShape.cpp (revision 417) -+++ src/OgreBoxCollisionShape.cpp (working copy) -@@ -204,8 +204,7 @@ +Index: src/OgreBoxCollisionShape.cpp
+===================================================================
+--- src/OgreBoxCollisionShape.cpp (revision 417)
++++ src/OgreBoxCollisionShape.cpp (working copy)
+@@ -204,8 +204,7 @@
calculateSize();
@@ -69,24 +52,11 @@ Index: src/OgreBoxCollisionShape.cpp return true;
}
-Index: src/OgreCollisionContext.cpp -=================================================================== ---- src/OgreCollisionContext.cpp (revision 417) -+++ src/OgreCollisionContext.cpp (working copy) -@@ -420,7 +420,7 @@ - // do the contact check between 2 moving spheres
- sphere s0(position,radius);
- sphere s1(p1,(*other)->getRadius());
-- float u0,u1;
-+ Ogre::Real u0,u1;
- checkReportHandler.mTotalBVBVTests++;
- if (s0.intersect_sweep(movementVector,s1,v1,u0,u1))
- {
-Index: src/OgreCollisionManager.cpp -=================================================================== ---- src/OgreCollisionManager.cpp (revision 417) -+++ src/OgreCollisionManager.cpp (working copy) -@@ -36,19 +36,19 @@ +Index: src/OgreCollisionManager.cpp
+===================================================================
+--- src/OgreCollisionManager.cpp (revision 417)
++++ src/OgreCollisionManager.cpp (working copy)
+@@ -36,19 +36,19 @@
using namespace Ogre;
using namespace OgreOpcode::Details;
@@ -109,11 +79,11 @@ Index: src/OgreCollisionManager.cpp }
CollisionManager::CollisionManager(SceneManager* sMgr)
-Index: src/OgreMeshCollisionShape.cpp -=================================================================== ---- src/OgreMeshCollisionShape.cpp (revision 417) -+++ src/OgreMeshCollisionShape.cpp (working copy) -@@ -287,8 +287,7 @@ +Index: src/OgreMeshCollisionShape.cpp
+===================================================================
+--- src/OgreMeshCollisionShape.cpp (revision 417)
++++ src/OgreMeshCollisionShape.cpp (working copy)
+@@ -287,8 +287,7 @@
}
mParentNode = mDummyNode;
@@ -123,3 +93,29 @@ Index: src/OgreMeshCollisionShape.cpp return rebuild();
}
+Index: bootstrap
+===================================================================
+--- bootstrap (revision 417)
++++ bootstrap (working copy)
+@@ -7,8 +7,8 @@
+ # - libtool 1.4+
+
+ # Deal with some gentoo-specific issues
+-export WANT_AUTOMAKE='1.7'
+-export WANT_AUTOCONF='2.5'
++#export WANT_AUTOMAKE='1.7'
++#export WANT_AUTOCONF='2.5'
+
+ ## Using prereq in autoconf rather than here, mostly for the debian systems at
+ ## this point
+@@ -31,4 +31,9 @@
+ rm -rf autom4te.cache
+
+ # Fire up autotools
+-libtoolize --force --copy && aclocal -I scripts/m4 $ACLOCAL_FLAGS && autoheader && automake --include-deps --add-missing --foreign --copy && autoconf
++autoreconf
++libtoolize --force --copy
++aclocal -I scripts/m4 $ACLOCAL_FLAGS
++autoheader
++automake --include-deps --add-missing --foreign --copy
++autoconf
|