-files/ogreopcode-417-ogre-1.7.2.patch, +files/ogreopcode-417-ogre-1.8.0.patch

Build ogreopcode against ogre 1.8

4 files changed, 77 insertions, 32 deletions

diff --git a/dev-games/ogreopcode/ChangeLog b/dev-games/ogreopcode/ChangeLog
index 803725e..66824ed 100644
--- a/dev-games/ogreopcode/ChangeLog
+++ b/dev-games/ogreopcode/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Sep 2012; Christoph Brill <egore911@egore911.de> ogreopcode-417.ebuild,
+  -files/ogreopcode-417-ogre-1.7.2.patch,
+  +files/ogreopcode-417-ogre-1.8.0.patch:
+  Build ogreopcode against ogre 1.8
+
 *ogreopcode-20120908 (09 Sep 2012)
 
   09 Sep 2012; Christoph Brill <egore911@egore911.de>
diff --git a/dev-games/ogreopcode/Manifest b/dev-games/ogreopcode/Manifest
index af885bd..f168c06 100644
--- a/dev-games/ogreopcode/Manifest
+++ b/dev-games/ogreopcode/Manifest
@@ -1,6 +1,6 @@
-AUX ogreopcode-417-ogre-1.7.2.patch 2579 SHA256 a8aa5fe12a969230ee46b264cb831b34c3f00d31f5f7c7f2c242b81f9293d401 SHA512 c9b889cd8b19adea1fd2721ab0cdd0299f0ffb194c3e3de2df0d9b0db3840f905e0ca81016bc257ebfa34f53b19a7a0310c3be8571728528f6f79b9728a0c3f2 WHIRLPOOL ba29ce2949c4c049f988acd81716d46242e990f8051859d1167895469c8fe15d3f27051a2b356da0d6a2294465ffc158e9f4d449f8b155dd221ac492d2f4d346
+AUX ogreopcode-417-ogre-1.8.0.patch 4001 SHA256 955a7ea6657ad4a4a1549c53b81de0e75c316bd4117dd12cbf7ca04f633da8e8 SHA512 f9605874665bbc3f0fe85c613561aa7241fc61bd80ba5fab3eadddb1cedd25f2e3ce865a822504526428394aaf944a9a8ecf5f49185fc33b99e97aa2cc74499e WHIRLPOOL fd53d7eab4fc8dd0c0a53331b398b30e82a3fc3d76a784e639473a7aebd651791dfc30cf5ca3c83388b6917f16770d9efded0ba54b481400752a2d4fe76fc01f
 DIST Opcode.zip 201547 SHA256 ecf649c786b4916e15cd613eef1ec5b727ee7cca11865fc9fae886151644fb91 SHA512 1dfd7c6a16a2fa8fe7593717a1ddb268b0a881ef1ee0c5cdd857768c7e854d28d1e3c51a1e2491bc2b69e5ee5d3921431b66d6e2836b5b230f0d2952ab72269a WHIRLPOOL e5e79bec70896fdc4baa884a1f4839c809baefc6d1f52fdd9540b6f6b98ae8c0f9d9543d68f6b90e91e1323ae5d8c35e759f2366ed905d72e64710453d958d7e
 EBUILD ogreopcode-20120908.ebuild 721 SHA256 2f06aea6747d24973ee7c1e31ded706faa6123cbf4cef381f4d42d7e666b46ad SHA512 469478a780c974d540187b1f4a476ae545cf06bf87815d0cb53f9a30298dbe8ec390195881ef1f4d5406a144b758210b4409a59f4ef8cac8beac36219a018733 WHIRLPOOL 4d8c635b2d2cc7554448e1c946552c7640f45d83f0a5cff240f56dc7ed419c6331448f813c3b81e32a68f56f0de05ee12e2538ff58d8ff76fe2b886f6dc448fc
-EBUILD ogreopcode-417.ebuild 848 SHA256 377b3efe754e38fd52ffc32a2989b0a9f441f3eb6facba4b777095f6a4a15f2f SHA512 ecf0eea8dc18262d4b3eed3731ac9198c80b51a49d51d1bae9bbdf176d552ddf4ae0d87d42bfd1a5b05afd6baf31a5f57134e0a5713b33e92fab5a88a03a8800 WHIRLPOOL 7000a8ffeec676317f3ed389f15c1f9782ce4a4acb94ff0f26023727a950f8d337dc61c521e9447b0f086c133fb9cbc9ab3bb4e7a516ed1915f4cbbfa57e9d3b
-MISC ChangeLog 1091 SHA256 88412b1ce78186d380f9c421452dd796cf6f6a9d6cc67ddff5de84a772818127 SHA512 9f5788fd4bf7fbc6fe75cf2eef6b3f6da176e26e8bbcad495a7ae29dac622504a7f2cd5e356272720d78d53d2472dd6ba3b17e685c2e49883884d64ed22bc120 WHIRLPOOL e36e67ce0f7753e4844e33a347cdf28593e43f38d4e5ddb9b8fa60e00f6849678e76e922ecdb5ce6836edf51a011ca9f68b36e9a6fedf9bfd2490a1620183dec
+EBUILD ogreopcode-417.ebuild 848 SHA256 ee4c3501b1a40484c6f2ebada1b6e963c6f9990f61ae87f0521a5c05789af4f8 SHA512 fbaa14a4f641d7ad296c0a168241d59a1be2e643813999ff89b743e445126e67e59901bab5290e84325dff7485ca7814808547e11a50b112bb2989ea62fc7cf8 WHIRLPOOL 9a0294d4fd1e8d0fc733d0ba5fd0a653623473efa69176d430685b7d1cc2f7866dcd7356fb91d16d93435c6b3b5c2aac7175198108ffa39fdcefc863e330e2d3
+MISC ChangeLog 1289 SHA256 d9311ebcb7fd8d18106a85e921889668d4c0229bbc8226032695150228dead45 SHA512 271241b1a2ab9fe8f66e27dba15c35eadf324737749f3b76c1b143ee3764eff964dc313f3ec0a089722da5b8ff2777589c5535cfd5ef9c6dc475d54db8d67b1f WHIRLPOOL 2d0234cb795f6a6ad85143df4bfe8b12c6cf9ab542ffd618063c994b9f33d0e3c70e414a20db922c598c11efbf42bf94a41b95459d1855e9ae80e848f48b9b61
 MISC metadata.xml 225 SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655 SHA512 3491fc1b84e75f659918ff5c3edc847d83cd1313fa8e5cf7859cec27ee38cbdf6fb91a73098ad1b4035f428dcbf7e0807686180d8304af485b79fb3e1f8b0c72 WHIRLPOOL ba7176f721ef5548423f54b8dda2cf845e0f3430a691d6e72004b197f03f7db1cc48cdc88799ec8247f6922cac7d2a79ebc93631900bcbc1f0ab73aca7a9d1ac
diff --git a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.7.2.patch b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch
index f3e83cb..16fd448 100644
--- a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.7.2.patch
+++ b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch
@@ -1,3 +1,29 @@
+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)
@@ -43,6 +69,46 @@ 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 @@
+ 

+ using namespace Ogre;

+ using namespace OgreOpcode::Details;

+-template<> OgreOpcode::CollisionManager* Ogre::Singleton<OgreOpcode::CollisionManager>::ms_Singleton = 0;

++template<> OgreOpcode::CollisionManager* Ogre::Singleton<OgreOpcode::CollisionManager>::msSingleton = 0;

+ 

+ namespace OgreOpcode

+ {

+ 

+ 	CollisionManager* CollisionManager::getSingletonPtr(void)

+ 	{

+-		return ms_Singleton;

++		return msSingleton;

+ 	}

+ 	

+ 	CollisionManager& CollisionManager::getSingleton(void)

+ 	{  

+-		assert( ms_Singleton );  return ( *ms_Singleton );  

++		assert( msSingleton );  return ( *msSingleton );  

+ 	}

+ 

+ 	CollisionManager::CollisionManager(SceneManager* sMgr)

 Index: src/OgreMeshCollisionShape.cpp
 ===================================================================
 --- src/OgreMeshCollisionShape.cpp	(revision 417)
@@ -57,29 +123,3 @@ 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 
diff --git a/dev-games/ogreopcode/ogreopcode-417.ebuild b/dev-games/ogreopcode/ogreopcode-417.ebuild
index dd73b89..395ba49 100644
--- a/dev-games/ogreopcode/ogreopcode-417.ebuild
+++ b/dev-games/ogreopcode/ogreopcode-417.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=dev-games/ogre-1.7.2"
+RDEPEND=">=dev-games/ogre-1.8.0"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -27,7 +27,7 @@ src_unpack(){
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/ogreopcode-417-ogre-1.7.2.patch
+	epatch "${FILESDIR}"/ogreopcode-417-ogre-1.8.0.patch
 }
 
 src_configure() {