Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-games/ogre/files: ogre-1.7.4-threading.patch ogre-1.7.4-gcc46.patch
Date: Sat, 03 Mar 2012 21:00:50
Message-Id: 20120303210039.E4E672004B@flycatcher.gentoo.org
1 vapier 12/03/03 21:00:39
2
3 Added: ogre-1.7.4-threading.patch ogre-1.7.4-gcc46.patch
4 Log:
5 Version bump #307205 by Christoph Brill, Myckel Habets, and hasufell.
6
7 (Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 dev-games/ogre/files/ogre-1.7.4-threading.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.7.4-threading.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.7.4-threading.patch?rev=1.1&content-type=text/plain
14
15 Index: ogre-1.7.4-threading.patch
16 ===================================================================
17 http://www.ogre3d.org/mantis/view.php?id=425
18
19 --- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
20 +++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
21 @@ -31,6 +31,7 @@
22 #include <signal.h>
23 #include "OgrePrerequisites.h"
24 #include "OgreException.h"
25 +#include "Threading/OgreThreadHeaders.h"
26
27 namespace Ogre {
28
29 --- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
30 +++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
31 @@ -42,6 +42,8 @@
32 # pragma GCC visibility pop
33 #endif
34
35 +#include "Threading/OgreThreadHeaders.h"
36 +
37 namespace Ogre {
38 /** \addtogroup Core
39 * @{
40 --- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
41 +++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
42 @@ -31,6 +31,7 @@
43
44 #include "OgrePrerequisites.h"
45 #include "OgrePolygon.h"
46 +#include "Threading/OgreThreadHeaders.h"
47
48
49 namespace Ogre
50 @@ -58,9 +59,7 @@
51
52 // Static 'free list' of polygons to save reallocation, shared between all bodies
53 static PolygonList msFreePolygons;
54 -#if OGRE_THREAD_SUPPORT
55 OGRE_STATIC_MUTEX(msFreePolygonsMutex)
56 -#endif
57
58 public:
59 ConvexBody();
60 --- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
61 +++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
62 @@ -32,6 +32,8 @@
63 #include "OgrePrerequisites.h"
64 #include "OgreString.h"
65
66 +#include "Threading/OgreThreadHeaders.h"
67 +
68 namespace Ogre {
69
70 /** \addtogroup Core
71 --- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
72 +++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
73 @@ -30,6 +30,8 @@
74
75 #include "OgrePrerequisites.h"
76
77 +#include "Threading/OgreThreadHeaders.h"
78 +
79 namespace Ogre {
80 /** \addtogroup Core
81 * @{
82 --- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
83 +++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
84 @@ -44,9 +44,7 @@
85 // Statics
86 //-----------------------------------------------------------------------
87 ConvexBody::PolygonList ConvexBody::msFreePolygons;
88 -#if OGRE_THREAD_SUPPORT
89 OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
90 -#endif
91 //-----------------------------------------------------------------------
92 void ConvexBody::_initialisePool()
93 {
94
95
96
97 1.1 dev-games/ogre/files/ogre-1.7.4-gcc46.patch
98
99 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.7.4-gcc46.patch?rev=1.1&view=markup
100 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/files/ogre-1.7.4-gcc46.patch?rev=1.1&content-type=text/plain
101
102 Index: ogre-1.7.4-gcc46.patch
103 ===================================================================
104 --- a/OgreMain/include/OgreOptimisedUtil.h
105 +++ b/OgreMain/include/OgreOptimisedUtil.h
106 @@ -29,6 +29,7 @@ Torus Knot Software Ltd.
107 #ifndef __OptimisedUtil_H__
108 #define __OptimisedUtil_H__
109
110 +#include <cstddef>
111 #include "OgrePrerequisites.h"
112 #include "OgreEdgeListBuilder.h"