version bump wrt bug #418201

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

6 files changed, 210 insertions, 13 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 38a6b7d44f3f..98e5fdd948a5 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.77 2012/06/04 17:16:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.78 2012/06/12 22:41:02 hasufell Exp $
+
+*ogre-1.8.0 (12 Jun 2012)
+
+  12 Jun 2012; Julian Ospald <hasufell@gentoo.org> +ogre-1.8.0.ebuild,
+  +files/ogre-1.8.0-flags.patch, +files/ogre-1.8.0-threading.patch:
+  version bump wrt bug #418201
 
   04 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ogre-1.7.4-r1.ebuild:
   Stable for amd64, wrt bug #412675
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 8f226e5b8539..df7ea6eff16a 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -8,21 +8,25 @@ AUX ogre-1.6.5-cegui.patch 885 RMD160 0b2252ced3f1f7d3e1f3d429ff75a494d59f1793 S
 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
+AUX ogre-1.8.0-flags.patch 791 RMD160 f1c6575a3b5a5728a08f8859ff2fcd5cedee5b7d SHA1 5deea2d4c87edda473c090a7e8b7844ad8e3c456 SHA256 ee88c072c45e4ccefe956c8bbfacba4c7ddcac3328b74c04159c37c3f6c53378
+AUX ogre-1.8.0-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
+DIST ogre_src_v1-8-0.tar.bz2 88682669 RMD160 0eaa5e6bd631b34326a0e49b351dbeece92aa9ab SHA1 0fa7afd1bd7915f33df0a7f96a0f55c2b01297ec SHA256 2f59de73b0717c5d2084285f2594a045a9240a8a53e5b38203419c4e715c8ba6
 EBUILD ogre-1.6.5.ebuild 2528 RMD160 d87bfb3747006d0d7efe6ceb7e54d4362159391e SHA1 21959afb4d5fbdd37e55c36927492d82a95aa05e SHA256 ee511ad5a6254238644a2ffa61f9b8889fecdf0ed7b946fb302ba6e3881bb510
 EBUILD ogre-1.7.4-r1.ebuild 2367 RMD160 8d5881353dacfcc8fa840c3d01e135a6f22cd603 SHA1 f54ea9f7e84dfbf99b4c70097d6cec740579110d SHA256 bfe3afc9e1a66936f184dac0e3e680b7654da07620865a296934f2d9fd9c2582
 EBUILD ogre-1.7.4.ebuild 2343 RMD160 38c7e2b30189f527be347fccfd67e7ed4e055130 SHA1 88ad31fea83e307bdad90a91482cec1eb8eadeaf SHA256 02b0974ff1d7442af99b2be3a1869a494eb445febbe360960e3b3e33d01b5b09
-MISC ChangeLog 11264 RMD160 84cbb5223c1fe89d169414686ed738136994a083 SHA1 743f21be1ce29ab23c1251fdf6a4e296f9ee7e88 SHA256 fea2ba17453b7aadacb65edddeabdb5f4ed13bf60848108e09a597ee9339499a
-MISC metadata.xml 4957 RMD160 75356bd88e1fc20a19e854f2e639ba6ab2ab070d SHA1 4d8a950654503e4faa4be2c954259122f144103b SHA256 b4e2ab4bcf72e3ac0f8f751b6be711468b70f937708255f3d20737765a47f634
+EBUILD ogre-1.8.0.ebuild 2597 RMD160 a55e2bbe9a38c89445700398a5830411d028ec0f SHA1 6504b654d5230dc3b5795612e5ce02e6809b6ecf SHA256 86f1f051261cc79764dab7adb681e9305e5844fe3c1c60933f9505c4cfb13fce
+MISC ChangeLog 11467 RMD160 15ca1cd897759358ce9b01136dd1bd984a5d5c9e SHA1 261ed77ac425b1b9d533768dcb97cfa27ef46bb1 SHA256 86b73d386c14ddc47972e47b6a80a91ac35a25a95a17803ce677da29e00aaa61
+MISC metadata.xml 5014 RMD160 c9a0b98bb110fbc4100c469fb1bddd82fecafbf9 SHA1 e55b3fed8028fb6dd46497cf759efbe9ed7f2727 SHA256 7ea0c9b0e56cadc41e0e1ac195ee058ac8abb176a3ac5b8ffb8363af12fd54d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPzO1/AAoJEOTDgjZ80txdPrEH+gNzjgShKO8Rk9D4BoMaO9is
-KHZCaNNlC98okxvkB7CGf+AZz4dtCdu6qeV0ETTWoi7BJ9solK5oVj0OPkCZO/oL
-Xsuzel2TBlBmcjSuORDUuWTzT9XeepXeCTfCUgpEvvNVcKuqI4KoMesHdbYfMRqw
-xYiNXM1wMI8aWVsuZS4wEphw3/S7fjsyoHxMT8nwX+QfUFfnlUePBkm0PaitM2SH
-5aOfyyXa+VaP/aEBjQexQN9xTDHEBR8nSOrmMmzY/ENC6Lv8JHW9nJFhfHcunTRs
-fLIM47EZoGHiDlq3vL1ZR4gtaIpNVBLKuzFr5JWHouYuzRigLd4YsUAJ0as/qi8=
-=20z1
+iQEcBAEBAgAGBQJP18TPAAoJEFpvPKfnPDWzKCcH/jtu7DzYNsc3Pzx32kZosDD2
+o1KnltJEle62I+UB2jRRGoerdRASIKwxqqPZO/VRXcqpUpSYAar/Pj9Aqu1uVNdm
+bW7zFQAxVGiTeyLkFXuKhJ8ZJd3dbAR6TWSPufFnFy9CtGksYj+DzWcmavvK6Tdy
+7wSiMGriBBrLZVNOHvKsI9Y4qWAOWFNnNbViLXZbl1UzNDYQEUvSiqpdWUtWKFOa
+3ZM6voFPx5dHCL4xZOK9gZXsZgyzbHVukJIje1uFRIgV6e7Y6NQMj2naaT0iDDyw
+xe0ehdurQoRnyhUhAla3awP6uRdSXM882WXfX0GZTn4DGt3hsr2k90HRkOFVZhg=
+=LEbc
 -----END PGP SIGNATURE-----
diff --git a/dev-games/ogre/files/ogre-1.8.0-flags.patch b/dev-games/ogre/files/ogre-1.8.0-flags.patch
new file mode 100644
index 000000000000..3f8e89a21a33
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.0-flags.patch
@@ -0,0 +1,21 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed May 30 13:45:46 UTC 2012
+Subject: build system
+
+remove pre-set flags
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -97,12 +97,6 @@
+   if (OGRE_GCC_HAS_SSE)
+     add_definitions(-msse)
+   endif ()
+-  # This is a set of sensible warnings that provide meaningful output
+-  set(OGRE_WARNING_FLAGS "-Wno-deprecated -Wall -Wctor-dtor-privacy -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -pedantic -Wshadow -Wno-missing-field-initializers -Wno-long-long")
+-  if (NOT APPLE)
+-      set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter")
+-  endif ()
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}")
+ endif ()
+ if (MSVC)
+   if (CMAKE_BUILD_TOOL STREQUAL "nmake")
diff --git a/dev-games/ogre/files/ogre-1.8.0-threading.patch b/dev-games/ogre/files/ogre-1.8.0-threading.patch
new file mode 100644
index 000000000000..13cf5634e53d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.8.0-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 7596d2bb0dcd..85edd44d5d6c 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -79,7 +79,8 @@ Exporters
     <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="freeimage">support images via freeimage</flag>
+	<flag name="gles2">build OpenGL ES 2.x RenderSystem</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>
diff --git a/dev-games/ogre/ogre-1.8.0.ebuild b/dev-games/ogre/ogre-1.8.0.ebuild
new file mode 100644
index 000000000000..f1b37c872371
--- /dev/null
+++ b/dev-games/ogre/ogre-1.8.0.ebuild
@@ -0,0 +1,88 @@
+# 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.8.0.ebuild,v 1.1 2012/06/12 22:41:02 hasufell 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 gles2 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 )
+	gles2? ( || ( <media-libs/mesa-8.0.0[gles] >=media-libs/mesa-8.0.0[gles2] ) )
+	ois? ( dev-games/ois )
+	threads? (
+		poco? ( dev-libs/poco )
+		tbb? ( dev-cpp/tbb )
+	)
+	zip? ( sys-libs/zlib dev-libs/zziplib )"
+# gles1 currently broken wrt bug #418201
+DEPEND="${RDEPEND}
+	x11-proto/xf86vidmodeproto
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )"
+
+S=${WORKDIR}/${PN}_src_v${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.4-threading.patch
+	epatch "${FILESDIR}"/${P}-flags.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)
+		-DOGRE_BUILD_RENDERSYSTEM_GLES=OFF
+		$(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
+		$(cmake-utils_use profile OGRE_PROFILING)
+		$(cmake-utils_use test OGRE_BUILD_TESTS)
+		$(usex threads "-DOGRE_CONFIG_THREADS=2" "-DOGRE_CONFIG_THREADS=0")
+		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
+		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
+	)
+
+	if use threads ; then
+		local f
+		for f in boost poco tbb ; do
+			use ${f} || continue
+			mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+			break
+		done
+	fi
+
+	cmake-utils_src_configure
+}