diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 00:00:33 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 00:00:33 +0000 |
commit | c136b7e1dcc84596a08b2924d1b74fbd3275adba (patch) | |
tree | dccd7303f18bfb53b2590e7a8eee9be04f9e77a6 /dev-games/ogre/files | |
parent | old (diff) | |
download | gentoo-2-c136b7e1dcc84596a08b2924d1b74fbd3275adba.tar.gz gentoo-2-c136b7e1dcc84596a08b2924d1b74fbd3275adba.tar.bz2 gentoo-2-c136b7e1dcc84596a08b2924d1b74fbd3275adba.zip |
old
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-games/ogre/files')
-rw-r--r-- | dev-games/ogre/files/ogre-1.8.0-flags.patch | 21 | ||||
-rw-r--r-- | dev-games/ogre/files/ogre-1.8.0-threading.patch | 77 |
2 files changed, 0 insertions, 98 deletions
diff --git a/dev-games/ogre/files/ogre-1.8.0-flags.patch b/dev-games/ogre/files/ogre-1.8.0-flags.patch deleted file mode 100644 index 3f8e89a21a33..000000000000 --- a/dev-games/ogre/files/ogre-1.8.0-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index 13cf5634e53d..000000000000 --- a/dev-games/ogre/files/ogre-1.8.0-threading.patch +++ /dev/null @@ -1,77 +0,0 @@ -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() - { |