Version bump #307205 by Christoph Brill, Myckel Habets, and hasufell.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

6 files changed, 213 insertions, 4 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index de521ba2e654..d71874a3561a 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/ogre
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.72 2011/09/04 21:49:53 mr_bones_ Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.73 2012/03/03 21:00:39 vapier Exp $
+
+*ogre-1.7.4 (03 Mar 2012)
+
+  03 Mar 2012; Mike Frysinger <vapier@gentoo.org> +ogre-1.7.4.ebuild,
+  +files/ogre-1.7.4-gcc46.patch, +files/ogre-1.7.4-threading.patch,
+  metadata.xml:
+  Version bump #307205 by Christoph Brill, Myckel Habets, and hasufell.
 
   04 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org> ogre-1.6.5.ebuild:
   needs <dev-games/cegui-0.7.5 to build (bug #375503)
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index dc0682284827..93e98b850e65 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ogre-1.6.5-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
 AUX ogre-1.6.5-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
 AUX ogre-1.6.5-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
 AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 SHA1 f94eaf64966efad0592cbb6aa90c1700deadbfc7 SHA256 364739dbc04d99eb4a1fd1faad37079dd9acc60b8181f96a399861d700940d6b
 AUX ogre-1.6.5-gcc46.patch 616 RMD160 505a9cb7c1d151af265ee1f76b12a262dda451c4 SHA1 b6ce9ec164dc1839bee7046110225148690fbe80 SHA256 99b9003f596a17705ee9f861784042d603579dbd99c93adfd8dd0323fce256c3
+AUX ogre-1.7.4-gcc46.patch 277 RMD160 2a39ba00b998bc29612e73acd18a04418ee64aa8 SHA1 4d2335771b8fe0edbc086fa839db981f30d8fa43 SHA256 fd07978db495bd6bce7117e35c9a79bb43a831ef10a44ebe12194b4d124226f6
+AUX ogre-1.7.4-threading.patch 2060 RMD160 c5b3280152d8a6e2e342ab7944a1917ff85e1eb5 SHA1 4c225a1a8091341a520ed85769d48810e4f31f6f SHA256 5404ac5abd128fbe0d6a54344d82cdc1587ef12932c7f152454ef5e60cec0212
 DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
+DIST ogre_src_v1-7-4.tar.bz2 67391570 RMD160 4259b45dc4b3c4f930053e0de5e4366eaf113840 SHA1 e989b96eacc2c66f8cf8a19dae6cfd962a165207 SHA256 afa475803d9e6980ddf3641dceaa53fcfbd348506ed67893c306766c166a4882
 EBUILD ogre-1.6.5.ebuild 2532 RMD160 7772e2501eaa348ab756d6137a9d190d41df6a20 SHA1 e17300958a36322e6e47cd1cbf09a2e869a20ab8 SHA256 d6b285bf6f8fd364250cba3b3e5cfb97658c66a154bdcb7d13df15a06d29ce80
-MISC ChangeLog 10499 RMD160 03b951b53d2b93f500989303d6c083f1e06bb855 SHA1 d0da54b235a1ee2093dc7e7ecc9a76b7af65e29a SHA256 945ec22f5b05327260cb5c9d057716a11b27a577a20206be82ac521d528c75cd
-MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
+EBUILD ogre-1.7.4.ebuild 2348 RMD160 204f93e2c8497356b7902c01d8cd981f139774fe SHA1 6108d5ad00bb1e36466ffbae26a358cd6bef2aa5 SHA256 9776895dd00c8fd5f92cc1318df72d979d4424a86b6261de0cb37ee39e6176d2
+MISC ChangeLog 10750 RMD160 ae86fb08c6421fe18a7fe7b0a0bc7981a6e0e014 SHA1 f821caac80bf93af42cedb4d995ca9483d1fee46 SHA256 6f9f7d23e85a4facb990fce559e2c2dc7cd3843268a970361d2567ba26b02f51
+MISC metadata.xml 4957 RMD160 75356bd88e1fc20a19e854f2e639ba6ab2ab070d SHA1 4d8a950654503e4faa4be2c954259122f144103b SHA256 b4e2ab4bcf72e3ac0f8f751b6be711468b70f937708255f3d20737765a47f634
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPUoaDAAoJELEHsLL7fEFWPhIQALOpPg1+z0jfBJHBafQMWjMC
+Yj2DaVZxXNsOJvc+WfjRoJsti3xXRlj9cd/ZxV6d78j7zKymzBBWVI+AdMPp9tbm
+b6grEoZD3WtLMkuO9pmSwWv73XUepyk4EbpsA0DE6x87XYLPei9/NMo8Ua2GkceU
+ygiO1zyW9Ofbalgtkl/o7NHEX1pR7C0OjIQSdAIgsjXfxgrk/KpC7cb94GLc6Dp5
+t8G4Nx9ij9Cnaof3SrCowVnS+I+bGEe4OMl1bPDo0UJ9OLopKIEGYXqHe0S/mj33
+uoLtdqrZLeb+oUX3qB5sK6bM78+TdAx7aR7wZprh3w/RglmdosRI7UEVUX4SC4iX
+CG+geBwFcq9903jBHhpxScyOMNkQCc/0V0N9f/8ERXKtMr7dg4Da1AGQsb7Ll6uT
+aC9mt94WZ7hzwmd4WCBdyPPNCIfL42+TBHGesx3+Nz8hNopxK3Q+uwlUO0O1qht+
+5OONVpfKiJlz6cL/I//mfhmH/5GeGHV/rcSw9KiFYG54o7kxSZWCpegxpaKHycnF
+GY3TmWzigNt/JJy1QdR7EKrZiSP4VPiGV6QprRO/WBhm34OS+Q1rmf8skHGS/dvC
+DjZiXp31w0GWhYxa6KvLcwsZtf2mPQ/WFYeN8gfNWeRcnL+5hqwKT5MKxNtK+PBv
+0wSvMj+fDp9IJOIL9JOM
+=jvYI
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.7.4-gcc46.patch b/dev-games/ogre/files/ogre-1.7.4-gcc46.patch
new file mode 100644
index 000000000000..7fe766a0b994
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.4-gcc46.patch
@@ -0,0 +1,10 @@
+--- a/OgreMain/include/OgreOptimisedUtil.h
++++ b/OgreMain/include/OgreOptimisedUtil.h
+@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
+ #ifndef __OptimisedUtil_H__
+ #define __OptimisedUtil_H__
+ 
++#include <cstddef>
+ #include "OgrePrerequisites.h"
+ #include "OgreEdgeListBuilder.h"
+ 
diff --git a/dev-games/ogre/files/ogre-1.7.4-threading.patch b/dev-games/ogre/files/ogre-1.7.4-threading.patch
new file mode 100644
index 000000000000..13cf5634e53d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.4-threading.patch
@@ -0,0 +1,77 @@
+http://www.ogre3d.org/mantis/view.php?id=425
+
+--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
+@@ -31,6 +31,7 @@
+ #include <signal.h>
+ #include "OgrePrerequisites.h"
+ #include "OgreException.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ namespace Ogre {
+ 
+--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
+@@ -42,6 +42,8 @@
+ #   pragma GCC visibility pop
+ #endif
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
+@@ -31,6 +31,7 @@
+ 
+ #include "OgrePrerequisites.h"
+ #include "OgrePolygon.h"
++#include "Threading/OgreThreadHeaders.h"
+ 
+ 
+ namespace Ogre
+@@ -58,9 +59,7 @@
+ 
+ 		// Static 'free list' of polygons to save reallocation, shared between all bodies
+ 		static PolygonList msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 		OGRE_STATIC_MUTEX(msFreePolygonsMutex)
+-#endif
+ 
+ 	public:
+ 		ConvexBody();
+--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
+@@ -32,6 +32,8 @@
+ #include "OgrePrerequisites.h"
+ #include "OgreString.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 
+ 	/** \addtogroup Core
+--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
+@@ -30,6 +30,8 @@
+ 
+ #include "OgrePrerequisites.h"
+ 
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ 	/** \addtogroup Core
+ 	*  @{
+--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
++++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
+@@ -44,9 +44,7 @@
+ 	// Statics
+ 	//-----------------------------------------------------------------------
+ 	ConvexBody::PolygonList ConvexBody::msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ 	OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
+-#endif
+ 	//-----------------------------------------------------------------------
+ 	void ConvexBody::_initialisePool()
+ 	{
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 4cc80de17f6d..7596d2bb0dcd 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -74,9 +74,16 @@ Exporters
     * Maya (meshes)
 </longdescription>
   <use>
+    <flag name="boost">enable boost support</flag>
     <flag name="cegui">build the CEGUI samples</flag>
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="devil">image loading support with DevIL</flag>
     <flag name="double-precision">more precise calculations at the expense of speed</flag>
+    <flag name="freeimage">support images via freeimage</flag>
+    <flag name="ois">pull in Object-oriented Input System library for samples</flag>
+    <flag name="poco">when USE=threads, use poco for threading</flag>
+    <flag name="tbb">when USE=threads, use tbb for threading</flag>
+    <flag name="tools">build+install helper tools</flag>
+    <flag name="zip">support zip archives</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-games/ogre/ogre-1.7.4.ebuild b/dev-games/ogre/ogre-1.7.4.ebuild
new file mode 100644
index 000000000000..07eccdd245c8
--- /dev/null
+++ b/dev-games/ogre/ogre-1.7.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4.ebuild,v 1.1 2012/03/03 21:00:39 vapier Exp $
+
+EAPI="4"
+
+inherit eutils cmake-utils
+
+MY_PV=${PV//./-}
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip"
+REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
+RESTRICT="test" #139905
+
+RDEPEND="media-libs/freetype:2
+	virtual/opengl
+	virtual/glu
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXrandr
+	x11-libs/libXt
+	boost? ( dev-libs/boost )
+	cg? ( media-gfx/nvidia-cg-toolkit )
+	freeimage? ( media-libs/freeimage )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )"
+
+S=${WORKDIR}/${PN}_src_v${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	epatch "${FILESDIR}"/${P}-threading.patch
+	sed -i \
+		-e "s:share/OGRE/docs:share/doc/${PF}:" \
+		Docs/CMakeLists.txt || die
+	# Stupid build system hardcodes release names
+	sed -i \
+		-e '/CONFIGURATIONS/s:CONFIGURATIONS.*::' \
+		CMake/Utils/OgreConfigTargets.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOGRE_FULL_RPATH=NO
+		$(cmake-utils_use boost OGRE_USE_BOOST)
+		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
+		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+		$(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+		$(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+		$(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use test OGRE_BUILD_TESTS)
+		$(cmake-utils_use threads OGRE_CONFIG_THREADS)
+		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
+		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
+	)
+
+	if use threads ; then
+		local f
+		for f in poco tbb boost ; do
+			use ${f} || continue
+			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+			break
+		done
+	fi
+
+	cmake-utils_src_configure
+}