diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-07-02 05:29:14 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-07-02 05:29:14 +0000 |
commit | cc59b014b282cc24e20d8cc696802d9fda43d870 (patch) | |
tree | 22f152b399a655771af7bce692036bac24db3ae2 /dev-games/ogre | |
parent | Cleanups for migration to new Java system. (diff) | |
download | historical-cc59b014b282cc24e20d8cc696802d9fda43d870.tar.gz historical-cc59b014b282cc24e20d8cc696802d9fda43d870.tar.bz2 historical-cc59b014b282cc24e20d8cc696802d9fda43d870.zip |
old
Diffstat (limited to 'dev-games/ogre')
-rw-r--r-- | dev-games/ogre/Manifest | 48 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.0.1-autotools.patch | 102 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.0.2-autotools.patch | 20 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.0.6-gcc41.patch | 61 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.0.7-gcc34.patch | 10 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.0.7-gcc41.patch | 61 |
6 files changed, 16 insertions, 286 deletions
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index 1240e8d5bc6d..9d394263321f 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -5,40 +5,24 @@ AUX 0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e SHA1 MD5 0d32a739d9a15e9734ab1f73a763e150 files/0.15.1-nocg.patch 1535 RMD160 9969ea43bb6caa6cf19e297de2e60cf62c5a2d9e files/0.15.1-nocg.patch 1535 SHA256 7b931bde184602cf09704685f7967827f24e32926ec8dc0a5411f8f24960279e files/0.15.1-nocg.patch 1535 -AUX ogre-1.0.1-autotools.patch 3482 RMD160 601c6533ab832176d8cf37668557d4338831dc59 SHA1 a14667d66e1d810707220e71553b3f8ecb3a4a2f SHA256 43982939136c12a24743b6ab661b08fb39356ed41e7cbe3631252f163c80b4b5 -MD5 00b83fe5730136f01f243b1f16fd478f files/ogre-1.0.1-autotools.patch 3482 -RMD160 601c6533ab832176d8cf37668557d4338831dc59 files/ogre-1.0.1-autotools.patch 3482 -SHA256 43982939136c12a24743b6ab661b08fb39356ed41e7cbe3631252f163c80b4b5 files/ogre-1.0.1-autotools.patch 3482 -AUX ogre-1.0.2-autotools.patch 672 RMD160 ec1594fa23efee31ca5c78f68a13def0657ff061 SHA1 4a9374acfb57c3aaca5464b63840862eefc41b95 SHA256 38d3d7ec2682c14cd617057bb09bdd1bb476e3d46af494b4055c196c730259b3 -MD5 a71b8412cf3e1e75c6d8cf54120adc2e files/ogre-1.0.2-autotools.patch 672 -RMD160 ec1594fa23efee31ca5c78f68a13def0657ff061 files/ogre-1.0.2-autotools.patch 672 -SHA256 38d3d7ec2682c14cd617057bb09bdd1bb476e3d46af494b4055c196c730259b3 files/ogre-1.0.2-autotools.patch 672 -AUX ogre-1.0.6-gcc41.patch 2964 RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea SHA1 ef3cd30538f361dabeeda82f1b3fd5916a8d3f32 SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a -MD5 6346d883e358b13caee4ac980927f835 files/ogre-1.0.6-gcc41.patch 2964 -RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea files/ogre-1.0.6-gcc41.patch 2964 -SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a files/ogre-1.0.6-gcc41.patch 2964 -AUX ogre-1.0.7-gcc34.patch 374 RMD160 e7d7a0065d7c2adbd368d02e32169bb1ef0e665d SHA1 e92b289be578a2d2b8c9ad9ba32e283252387016 SHA256 86e701c1aa4e06999fdfe1b4a1492abd5a1e576a8176b50ec8bde36383b30566 -MD5 9cc328294f149f199ee3547fcb2b3f29 files/ogre-1.0.7-gcc34.patch 374 -RMD160 e7d7a0065d7c2adbd368d02e32169bb1ef0e665d files/ogre-1.0.7-gcc34.patch 374 -SHA256 86e701c1aa4e06999fdfe1b4a1492abd5a1e576a8176b50ec8bde36383b30566 files/ogre-1.0.7-gcc34.patch 374 -AUX ogre-1.0.7-gcc41.patch 2964 RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea SHA1 ef3cd30538f361dabeeda82f1b3fd5916a8d3f32 SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a -MD5 6346d883e358b13caee4ac980927f835 files/ogre-1.0.7-gcc41.patch 2964 -RMD160 53f750cdd7113d1642a15bbbcee5bcc5470bc4ea files/ogre-1.0.7-gcc41.patch 2964 -SHA256 4ee1c89b97ecbb9e0735bef2a0232d63c2116eaa4e09dba6e7c8bfe64562a65a files/ogre-1.0.7-gcc41.patch 2964 +AUX ogre-1.2.1-autoconf.patch 394 RMD160 16a36f92af68903c79ec274e3af36a6f46adf137 SHA1 a84687e5941c87e44adb25df704bfd2d53197151 SHA256 57305b7cd52ed2fe93ed8bc9ffff310f3c494e46f5972f17d8506b21a42401a5 +MD5 3d83807a6182eaf59f147e1cff3d5912 files/ogre-1.2.1-autoconf.patch 394 +RMD160 16a36f92af68903c79ec274e3af36a6f46adf137 files/ogre-1.2.1-autoconf.patch 394 +SHA256 57305b7cd52ed2fe93ed8bc9ffff310f3c494e46f5972f17d8506b21a42401a5 files/ogre-1.2.1-autoconf.patch 394 DIST ogre-linux_osx-v0-15-1.tar.bz2 24570136 DIST ogre-linux_osx-v1-2-1.tar.bz2 22844626 RMD160 c34a9a32c8f8e3b98a5dc3c98649a45347bd1baf SHA1 ba47a38cf23cafbf37dd2df74aa90d98e4032780 SHA256 464467f46b555f6223ad4e2c68fe2f655c67f7aed6a8ce4eb03d5aa49c04dc32 EBUILD ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 SHA1 9b4bfa5a7d8f389e6cf4b4f01d25e4a946de3dc3 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4 MD5 0b1ac52dc3bcf567017d7f496464eb81 ogre-0.15.1.ebuild 1436 RMD160 6b1d571bd72c17a0e93a2a683cb78c81b4dbfeb0 ogre-0.15.1.ebuild 1436 SHA256 f5705dcac9ff289e48f02ce9b402f33eeb93964cf9702d93fd8ff656ab1030b4 ogre-0.15.1.ebuild 1436 -EBUILD ogre-1.2.1.ebuild 1744 RMD160 18b711fb1c61114682612c7bc2669fbfb387e0a3 SHA1 7c37110ba56f2ccb2ade7f9cde53051ca11af915 SHA256 f244575d9c56d6a1dcbfba7c8c1bc705af468a897c4e8ea8b755d27fdb090014 -MD5 500767fe0bd6d0304e942e4c39f55f79 ogre-1.2.1.ebuild 1744 -RMD160 18b711fb1c61114682612c7bc2669fbfb387e0a3 ogre-1.2.1.ebuild 1744 -SHA256 f244575d9c56d6a1dcbfba7c8c1bc705af468a897c4e8ea8b755d27fdb090014 ogre-1.2.1.ebuild 1744 -MISC ChangeLog 3887 RMD160 c1dd65d6f41aba9ce73a4e44982aebb9ad23e087 SHA1 b07c79c27354cba6f4e2a2cb0bbb7b9810d05ca3 SHA256 c321789bcb8b0fd28ff36803f1748e44801c65b60d8eeead3bd80990946bee37 -MD5 dab13167aee91868b6f42036cc25c721 ChangeLog 3887 -RMD160 c1dd65d6f41aba9ce73a4e44982aebb9ad23e087 ChangeLog 3887 -SHA256 c321789bcb8b0fd28ff36803f1748e44801c65b60d8eeead3bd80990946bee37 ChangeLog 3887 +EBUILD ogre-1.2.1.ebuild 1799 RMD160 51c8e4a8878ab1bdd344d15d33060baed419c2e8 SHA1 92a2ec5358295be08a2adce8c0b012271e6e20f6 SHA256 c6099a7b909a5b5d15228eff58319f14419cc05af6dfc88bead3b7f6d7b3221b +MD5 b7f237106e3d060d26e7085464dfde4c ogre-1.2.1.ebuild 1799 +RMD160 51c8e4a8878ab1bdd344d15d33060baed419c2e8 ogre-1.2.1.ebuild 1799 +SHA256 c6099a7b909a5b5d15228eff58319f14419cc05af6dfc88bead3b7f6d7b3221b ogre-1.2.1.ebuild 1799 +MISC ChangeLog 4048 RMD160 d45956819ad6db0741a5e4476263b24a3a9225f1 SHA1 386204fae24fee301014338408d8fefb56af1fd5 SHA256 43ff2c082658c8e9b8795425f619c96e7e725322fbb510e263080615e8a7a446 +MD5 64710b728059c36993ca8db032489103 ChangeLog 4048 +RMD160 d45956819ad6db0741a5e4476263b24a3a9225f1 ChangeLog 4048 +SHA256 43ff2c082658c8e9b8795425f619c96e7e725322fbb510e263080615e8a7a446 ChangeLog 4048 MISC metadata.xml 4326 RMD160 dc14cc3b5869cbfddc4791048dcbb92bc59553de SHA1 d0993b0bec7374873d100294bf7085bed4b99101 SHA256 18f503fee6e9acb25ea9f9d7efafb0c6c454bfb1519a13b811f2aed18f1b7927 MD5 b11c4d3064c807f259eae5a15f61232a metadata.xml 4326 RMD160 dc14cc3b5869cbfddc4791048dcbb92bc59553de metadata.xml 4326 @@ -50,9 +34,9 @@ MD5 6c7d139243316467c584bc9b0c3be477 files/digest-ogre-1.2.1 274 RMD160 9268ef77899d88791ffd3f7bf2304ceea0565a47 files/digest-ogre-1.2.1 274 SHA256 6555e7e78a198c0c0722d98e5164669cdd40af501d1d0e5eb8e593e9c0c1a874 files/digest-ogre-1.2.1 274 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) +Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFEoZo89AbAhSK0CiwRAn2BAJ0WKfkLnXAGrk81RqEwqI1haChvOACfY7bb -3aoGoHqVA3OWEORxe3pz4ZQ= -=wcdK +iD8DBQFEp1s2amhnQswr0vIRAvrPAJ4u5n/U75NvJVugjHCuzKShaTpOqwCeIBlV +rnQ0I7P969bgvFciB0N4NpA= +=D8M3 -----END PGP SIGNATURE----- diff --git a/dev-games/ogre/files/ogre-1.0.1-autotools.patch b/dev-games/ogre/files/ogre-1.0.1-autotools.patch deleted file mode 100644 index 9d759a5b9d86..000000000000 --- a/dev-games/ogre/files/ogre-1.0.1-autotools.patch +++ /dev/null @@ -1,102 +0,0 @@ -Autotool code has a bunch of random mistakes, lets fix them. - -- crosscompiling should look at $host, not at $build or $target -- use AC_MSG_RESULT() instead of doing a 'raw' echo -- AC_ARG_WITH / AC_ARG_ENABLE handles 3rd param incorrectly -- threading support uses boost but never links it in !? - ---- acinclude.m4 -+++ acinclude.m4 -@@ -278,3 +278,3 @@ - AC_DEFUN([OGRE_SETUP_FOR_TARGET], --[case $target in -+[case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32*) -@@ -324,9 +324,9 @@ - [Build the OpenEXR plugin]), -- [build_exr=true], -- [build_exr=false]) -+ [build_exr=$enableval], -+ [build_exr=no]) - --if test "x$build_exr" = "xtrue" ; then -- PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=true], [build_exr=false]) -+if test "x$build_exr" = "xyes" ; then -+ PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no]) - -- if test "x$build_exr" = "xtrue" ; then -+ if test "x$build_exr" = "xyes" ; then - AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \ -@@ -341,3 +341,3 @@ - --AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xtrue) -+AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xyes) - -@@ -380,6 +380,6 @@ - [Build the DirectX 9 Render System]), -- [build_dx9=true], -- [build_dx9=false]) -+ [build_dx9=$enableval], -+ [build_dx9=no]) - --AM_CONDITIONAL(BUILD_DX9RENDERSYSTEM, test x$build_dx9 = xtrue) -+AM_CONDITIONAL(BUILD_DX9RENDERSYSTEM, test x$build_dx9 = xyes) - -@@ -391,8 +391,8 @@ - [Don't use DevIL for image loading. This is not recommended unless you provide your own image loading codecs.]), -- [build_il=false], -- [build_il=true]) -+ [build_il=$enableval], -+ [build_il=yes]) - --AM_CONDITIONAL(USE_DEVIL, test x$build_il = xtrue) -+AM_CONDITIONAL(USE_DEVIL, test x$build_il = xyes) - --if [ test x$build_il = xtrue ]; then -+if test x$build_il = xyes ; then - AC_CHECK_LIB(IL, ilInit,,AC_MSG_ERROR([ -@@ -418,9 +418,9 @@ - AC_MSG_CHECKING([whether -fPIC is needed]) -- case $build in -+ case $host in - x86_64-*) - CXXFLAGS="$CXXFLAGS -fPIC" -- echo "yes" -+ AC_MSG_RESULT(yes) - ;; - *) -- echo "no" -+ AC_MSG_RESULT(no) - ;; -@@ -459,3 +459,3 @@ - AC_DEFINE([OGRE_DOUBLE_PRECISION], [1], [Build with double precision]) -- echo "yes" -+ AC_MSG_RESULT(yes) - ;; -@@ -463,3 +463,3 @@ - AC_DEFINE([OGRE_DOUBLE_PRECISION], [0], [Build with double precision]) -- echo "no" -+ AC_MSG_RESULT(no) - ;; -@@ -479,3 +479,4 @@ - AC_DEFINE([OGRE_THREAD_SUPPORT], [1], [Build with thread support]) -- echo "yes" -+ OGRE_THREAD_LIBS="-lboost_thread-mt" -+ AC_MSG_RESULT(yes) - ;; -@@ -483,5 +484,7 @@ - AC_DEFINE([OGRE_THREAD_SUPPORT], [0], [Build with thread support]) -- echo "no" -+ OGRE_THREAD_LIBS="" -+ AC_MSG_RESULT(no) - ;; - esac -+AC_SUBST(OGRE_THREAD_LIBS) - ]) ---- OgreMain/src/Makefile.am.orig 2005-05-03 13:33:08.000000000 -0400 -+++ OgreMain/src/Makefile.am 2005-05-03 13:37:12.000000000 -0400 -@@ -156,3 +156,3 @@ - --libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) -+libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(OGRE_THREAD_LIBS) - libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@ diff --git a/dev-games/ogre/files/ogre-1.0.2-autotools.patch b/dev-games/ogre/files/ogre-1.0.2-autotools.patch deleted file mode 100644 index 07324d525dab..000000000000 --- a/dev-games/ogre/files/ogre-1.0.2-autotools.patch +++ /dev/null @@ -1,20 +0,0 @@ -The build exr logic is inverted, so un-invert it. - -http://bugs.gentoo.org/95396 -https://sourceforge.net/tracker/index.php?func=detail&aid=1216798&group_id=2997&atid=302997 - ---- acinclude.m4 -+++ acinclude.m4 -@@ -325,10 +325,10 @@ - [build_exr=$enableval], - [build_exr=no]) - --if test "x$build_exr" = "xno" ; then -+if test "x$build_exr" = "xyes" ; then - PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no]) - -- if test "x$build_exr" = "xno" ; then -+ if test "x$build_exr" = "xyes" ; then - AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \ - PlugIns/EXRCodec/src/Makefile \ - PlugIns/EXRCodec/include/Makefile]) diff --git a/dev-games/ogre/files/ogre-1.0.6-gcc41.patch b/dev-games/ogre/files/ogre-1.0.6-gcc41.patch deleted file mode 100644 index 91a0357848be..000000000000 --- a/dev-games/ogre/files/ogre-1.0.6-gcc41.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- ./ogrenew/OgreMain/include/OgreEntity.h.old 2005-11-16 21:39:05.000000000 +0100 -+++ ./ogrenew/OgreMain/include/OgreEntity.h 2006-01-28 15:10:57.000000000 +0100 -@@ -568,7 +568,7 @@ - - /** Stops sharing the SkeletonInstance with other entities. - */ -- void Entity::stopSharingSkeletonInstance(); -+ void stopSharingSkeletonInstance(); - - - /** - ---- ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h.old 2005-08-20 01:47:32.000000000 +0200 -+++ ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h 2006-01-28 15:18:38.000000000 +0100 -@@ -113,7 +113,7 @@ - * Lets you know when query is done, or still be processed by the Hardware - * @return true if query isn't finished. - */ -- virtual bool HardwareOcclusionQuery::isStillOutstanding(void) = 0; -+ virtual bool isStillOutstanding(void) = 0; - /** - * - * @Remarks This function allows you to set how often the hardware occlusion really are sent to the driver - ---- ./ogrenew/OgreMain/include/OgreImage.h.old 2005-04-06 15:30:43.000000000 +0200 -+++ ./ogrenew/OgreMain/include/OgreImage.h 2006-01-28 14:56:54.000000000 +0100 -@@ -136,7 +136,7 @@ - @remarks - The size of the buffer must be numFaces*PixelUtil::getMemorySize(width, height, depth, format) - */ -- Image& Image::loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, -+ Image& loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, - size_t depth, - PixelFormat eFormat, bool autoDelete = false, - size_t numFaces = 1, size_t numMipMaps = 0); - ---- ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h.old 2005-02-04 18:51:24.000000000 +0100 -+++ ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h 2006-01-28 15:30:05.000000000 +0100 -@@ -193,8 +193,8 @@ - /** Overridden from SceneManager */ - void clearScene(void); - -- AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const AxisAlignedBox& box, unsigned long mask); -- SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere& sphere, unsigned long mask); -+ AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box, unsigned long mask); -+ SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long mask); - PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask); - RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask); - IntersectionSceneQuery* createIntersectionQuery(unsigned long mask); - ---- ./ogrenew/Tools/XMLConverter/include/tinyxml.h.old 2003-09-11 00:48:29.000000000 +0200 -+++ ./ogrenew/Tools/XMLConverter/include/tinyxml.h 2006-01-28 15:42:29.000000000 +0100 -@@ -790,7 +790,7 @@ - #endif - - /// Construct. -- TiXmlDeclaration::TiXmlDeclaration( const char * _version, -+ TiXmlDeclaration( const char * _version, - const char * _encoding, - const char * _standalone ); - diff --git a/dev-games/ogre/files/ogre-1.0.7-gcc34.patch b/dev-games/ogre/files/ogre-1.0.7-gcc34.patch deleted file mode 100644 index 0503d5a2fafe..000000000000 --- a/dev-games/ogre/files/ogre-1.0.7-gcc34.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp.original 2006-03-20 22:08:17.000000000 +0100 -+++ PlatformManagers/SDL/src/OgreSDLConfig_gtk.cpp 2006-03-20 22:06:59.000000000 +0100 -@@ -22,6 +22,7 @@ - ----------------------------------------------------------------------------- - */ - -+#include "OgreLogManager.h" - #include "OgreSDLConfig.h" - - #include <libglademm/xml.h> diff --git a/dev-games/ogre/files/ogre-1.0.7-gcc41.patch b/dev-games/ogre/files/ogre-1.0.7-gcc41.patch deleted file mode 100644 index 91a0357848be..000000000000 --- a/dev-games/ogre/files/ogre-1.0.7-gcc41.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- ./ogrenew/OgreMain/include/OgreEntity.h.old 2005-11-16 21:39:05.000000000 +0100 -+++ ./ogrenew/OgreMain/include/OgreEntity.h 2006-01-28 15:10:57.000000000 +0100 -@@ -568,7 +568,7 @@ - - /** Stops sharing the SkeletonInstance with other entities. - */ -- void Entity::stopSharingSkeletonInstance(); -+ void stopSharingSkeletonInstance(); - - - /** - ---- ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h.old 2005-08-20 01:47:32.000000000 +0200 -+++ ./ogrenew/OgreMain/include/OgreHardwareOcclusionQuery.h 2006-01-28 15:18:38.000000000 +0100 -@@ -113,7 +113,7 @@ - * Lets you know when query is done, or still be processed by the Hardware - * @return true if query isn't finished. - */ -- virtual bool HardwareOcclusionQuery::isStillOutstanding(void) = 0; -+ virtual bool isStillOutstanding(void) = 0; - /** - * - * @Remarks This function allows you to set how often the hardware occlusion really are sent to the driver - ---- ./ogrenew/OgreMain/include/OgreImage.h.old 2005-04-06 15:30:43.000000000 +0200 -+++ ./ogrenew/OgreMain/include/OgreImage.h 2006-01-28 14:56:54.000000000 +0100 -@@ -136,7 +136,7 @@ - @remarks - The size of the buffer must be numFaces*PixelUtil::getMemorySize(width, height, depth, format) - */ -- Image& Image::loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, -+ Image& loadDynamicImage( uchar* pData, size_t uWidth, size_t uHeight, - size_t depth, - PixelFormat eFormat, bool autoDelete = false, - size_t numFaces = 1, size_t numMipMaps = 0); - ---- ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h.old 2005-02-04 18:51:24.000000000 +0100 -+++ ./ogrenew/PlugIns/OctreeSceneManager/include/OgreOctreeSceneManager.h 2006-01-28 15:30:05.000000000 +0100 -@@ -193,8 +193,8 @@ - /** Overridden from SceneManager */ - void clearScene(void); - -- AxisAlignedBoxSceneQuery* OctreeSceneManager::createAABBQuery(const AxisAlignedBox& box, unsigned long mask); -- SphereSceneQuery* OctreeSceneManager::createSphereQuery(const Sphere& sphere, unsigned long mask); -+ AxisAlignedBoxSceneQuery* createAABBQuery(const AxisAlignedBox& box, unsigned long mask); -+ SphereSceneQuery* createSphereQuery(const Sphere& sphere, unsigned long mask); - PlaneBoundedVolumeListSceneQuery* createPlaneBoundedVolumeQuery(const PlaneBoundedVolumeList& volumes, unsigned long mask); - RaySceneQuery* createRayQuery(const Ray& ray, unsigned long mask); - IntersectionSceneQuery* createIntersectionQuery(unsigned long mask); - ---- ./ogrenew/Tools/XMLConverter/include/tinyxml.h.old 2003-09-11 00:48:29.000000000 +0200 -+++ ./ogrenew/Tools/XMLConverter/include/tinyxml.h 2006-01-28 15:42:29.000000000 +0100 -@@ -790,7 +790,7 @@ - #endif - - /// Construct. -- TiXmlDeclaration::TiXmlDeclaration( const char * _version, -+ TiXmlDeclaration( const char * _version, - const char * _encoding, - const char * _standalone ); - |