diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 17:34:50 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 17:34:50 +0000 |
| commit | b0b1c09e1324a2368ee7006ef72207d7dd6a5ac1 (patch) | |
| tree | b1b2ef760094850d8888c76019641398134ee334 /dev-games/ogre/files | |
| parent | This package is too cute to pass up, I'm adopting it. (diff) | |
| download | historical-b0b1c09e1324a2368ee7006ef72207d7dd6a5ac1.tar.gz historical-b0b1c09e1324a2368ee7006ef72207d7dd6a5ac1.tar.bz2 historical-b0b1c09e1324a2368ee7006ef72207d7dd6a5ac1.zip | |
version bump (bug #440074)
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'dev-games/ogre/files')
| -rw-r--r-- | dev-games/ogre/files/ogre-1.8.1-flags.patch | 21 | ||||
| -rw-r--r-- | dev-games/ogre/files/ogre-1.8.1-threading.patch | 77 |
2 files changed, 98 insertions, 0 deletions
diff --git a/dev-games/ogre/files/ogre-1.8.1-flags.patch b/dev-games/ogre/files/ogre-1.8.1-flags.patch new file mode 100644 index 000000000000..3f8e89a21a33 --- /dev/null +++ b/dev-games/ogre/files/ogre-1.8.1-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.1-threading.patch b/dev-games/ogre/files/ogre-1.8.1-threading.patch new file mode 100644 index 000000000000..13cf5634e53d --- /dev/null +++ b/dev-games/ogre/files/ogre-1.8.1-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() + { |