| 1 |
mr_bones_ 12/11/01 17:34:50 |
| 2 |
|
| 3 |
Added: ogre-1.8.1-flags.patch ogre-1.8.1-threading.patch |
| 4 |
Log: |
| 5 |
version bump (bug #440074) |
| 6 |
|
| 7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-games/ogre/files/ogre-1.8.1-flags.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.8.1-flags.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.8.1-flags.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ogre-1.8.1-flags.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Wed May 30 13:45:46 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
remove pre-set flags |
| 22 |
|
| 23 |
--- CMakeLists.txt |
| 24 |
+++ CMakeLists.txt |
| 25 |
@@ -97,12 +97,6 @@ |
| 26 |
if (OGRE_GCC_HAS_SSE) |
| 27 |
add_definitions(-msse) |
| 28 |
endif () |
| 29 |
- # This is a set of sensible warnings that provide meaningful output |
| 30 |
- 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") |
| 31 |
- if (NOT APPLE) |
| 32 |
- set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter") |
| 33 |
- endif () |
| 34 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}") |
| 35 |
endif () |
| 36 |
if (MSVC) |
| 37 |
if (CMAKE_BUILD_TOOL STREQUAL "nmake") |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-games/ogre/files/ogre-1.8.1-threading.patch |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.8.1-threading.patch?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.8.1-threading.patch?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: ogre-1.8.1-threading.patch |
| 47 |
=================================================================== |
| 48 |
http://www.ogre3d.org/mantis/view.php?id=425 |
| 49 |
|
| 50 |
--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h |
| 51 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h |
| 52 |
@@ -31,6 +31,7 @@ |
| 53 |
#include <signal.h> |
| 54 |
#include "OgrePrerequisites.h" |
| 55 |
#include "OgreException.h" |
| 56 |
+#include "Threading/OgreThreadHeaders.h" |
| 57 |
|
| 58 |
namespace Ogre { |
| 59 |
|
| 60 |
--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h |
| 61 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h |
| 62 |
@@ -42,6 +42,8 @@ |
| 63 |
# pragma GCC visibility pop |
| 64 |
#endif |
| 65 |
|
| 66 |
+#include "Threading/OgreThreadHeaders.h" |
| 67 |
+ |
| 68 |
namespace Ogre { |
| 69 |
/** \addtogroup Core |
| 70 |
* @{ |
| 71 |
--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h |
| 72 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h |
| 73 |
@@ -31,6 +31,7 @@ |
| 74 |
|
| 75 |
#include "OgrePrerequisites.h" |
| 76 |
#include "OgrePolygon.h" |
| 77 |
+#include "Threading/OgreThreadHeaders.h" |
| 78 |
|
| 79 |
|
| 80 |
namespace Ogre |
| 81 |
@@ -58,9 +59,7 @@ |
| 82 |
|
| 83 |
// Static 'free list' of polygons to save reallocation, shared between all bodies |
| 84 |
static PolygonList msFreePolygons; |
| 85 |
-#if OGRE_THREAD_SUPPORT |
| 86 |
OGRE_STATIC_MUTEX(msFreePolygonsMutex) |
| 87 |
-#endif |
| 88 |
|
| 89 |
public: |
| 90 |
ConvexBody(); |
| 91 |
--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h |
| 92 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h |
| 93 |
@@ -32,6 +32,8 @@ |
| 94 |
#include "OgrePrerequisites.h" |
| 95 |
#include "OgreString.h" |
| 96 |
|
| 97 |
+#include "Threading/OgreThreadHeaders.h" |
| 98 |
+ |
| 99 |
namespace Ogre { |
| 100 |
|
| 101 |
/** \addtogroup Core |
| 102 |
--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h |
| 103 |
+++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h |
| 104 |
@@ -30,6 +30,8 @@ |
| 105 |
|
| 106 |
#include "OgrePrerequisites.h" |
| 107 |
|
| 108 |
+#include "Threading/OgreThreadHeaders.h" |
| 109 |
+ |
| 110 |
namespace Ogre { |
| 111 |
/** \addtogroup Core |
| 112 |
* @{ |
| 113 |
--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp |
| 114 |
+++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp |
| 115 |
@@ -44,9 +44,7 @@ |
| 116 |
// Statics |
| 117 |
//----------------------------------------------------------------------- |
| 118 |
ConvexBody::PolygonList ConvexBody::msFreePolygons; |
| 119 |
-#if OGRE_THREAD_SUPPORT |
| 120 |
OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex) |
| 121 |
-#endif |
| 122 |
//----------------------------------------------------------------------- |
| 123 |
void ConvexBody::_initialisePool() |
| 124 |
{ |
Archives