version bump wrt bug #418201

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

5 files changed, 195 insertions, 2 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/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
+}