Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master games grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 games-libs/simgear/DEPENDS          |    1 
 games-libs/simgear/HISTORY          |    4 +++
 games-libs/simgear/PRE_BUILD        |    3 +-
 games-libs/simgear/boost-1.51.patch |   47 
++++++++++++++++++++++++++++++++++++
 games-simulation/flightgear/DEPENDS |    1 
 games-simulation/flightgear/HISTORY |    3 ++
 6 files changed, 56 insertions(+), 3 deletions(-)

New commits:
commit 68663dc712dad6c1a3f6a28c42ff2b0ba3573af4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    games-simulation/flightgear: remove dependency on openthreads

commit 8e95c6aef814db126c2467bb88d5f3c3aca3b346
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    games-libs/simgear: fix build error with boost 1.51, remove dependency on 
openthreads

diff --git a/games-libs/simgear/DEPENDS b/games-libs/simgear/DEPENDS
index b9cc9d5..2a99f72 100755
--- a/games-libs/simgear/DEPENDS
+++ b/games-libs/simgear/DEPENDS
@@ -3,7 +3,6 @@ depends  metakit         &&
 depends  OPENAL          &&
 depends  freealut        &&
 depends  boost           &&
-depends  openthreads     &&
 depends  openscenegraph  &&
 depends  subversion      &&
 depends  plib            &&
diff --git a/games-libs/simgear/HISTORY b/games-libs/simgear/HISTORY
index 193bbc8..83a661d 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,7 @@
+2012-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: removed dependency on openthreads
+       * PRE_BUILD, boost-1.51.patch: fix build error with boost 1.51
+
 2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.8.0
        * DEPENDS: depend on gcc with CXX
diff --git a/games-libs/simgear/PRE_BUILD b/games-libs/simgear/PRE_BUILD
index aae639c..45cf5fa 100755
--- a/games-libs/simgear/PRE_BUILD
+++ b/games-libs/simgear/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
 cp ${SCRIPT_DIRECTORY}/singleton.hpp ${SOURCE_DIRECTORY}/simgear/structure/ 
&&
 sedit 
's:<boost/pool/detail/singleton.hpp>:<simgear/structure/singleton.hpp>:' \
-      ${SOURCE_DIRECTORY}/simgear/structure/Singleton.hxx
+      ${SOURCE_DIRECTORY}/simgear/structure/Singleton.hxx &&
+patch -p1 < ${SPELL_DIRECTORY}/boost-1.51.patch
diff --git a/games-libs/simgear/boost-1.51.patch 
b/games-libs/simgear/boost-1.51.patch
new file mode 100644
index 0000000..b056213
--- /dev/null
+++ b/games-libs/simgear/boost-1.51.patch
@@ -0,0 +1,47 @@
+From 430e72b42404cd07685de13c767a9ca443ad1f49 Mon Sep 17 00:00:00 2001
+From: Frederic Bouvier <fredfgfs01 AT free.fr>
+Date: Sun, 2 Sep 2012 12:22:20 +0200
+Subject: [PATCH] Ugly hack to please Boost 1.51.0
+
+---
+ simgear/scene/material/Effect.cxx |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/simgear/scene/material/Effect.cxx 
b/simgear/scene/material/Effect.cxx
+index 2e10318..c934815 100644
+--- a/simgear/scene/material/Effect.cxx
++++ b/simgear/scene/material/Effect.cxx
+@@ -671,9 +671,9 @@ InstallAttributeBuilder<AlphaTestBuilder> 
installAlphaTest("alpha-test");
+ InstallAttributeBuilder<TextureUnitBuilder> 
textureUnitBuilder("texture-unit");
+ 
+ // Shader key, used both for shaders with relative and absolute names
+-typedef pair<string, Shader::Type> ShaderKey;
++typedef pair<string, int> ShaderKey;
+ 
+-inline ShaderKey makeShaderKey(SGPropertyNode_ptr& ptr, Shader::Type 
shaderType)
++inline ShaderKey makeShaderKey(SGPropertyNode_ptr& ptr, int shaderType)
+ {
+     return ShaderKey(ptr->getStringValue(), shaderType);
+ }
+@@ -815,7 +815,7 @@ void ShaderProgramBuilder::buildAttribute(Effect* 
effect, Pass* pass,
+     BOOST_FOREACH(const ShaderKey& shaderKey, prgKey.shaders)
+     {
+         const string& shaderName = shaderKey.first;
+-        Shader::Type stype = shaderKey.second;
++        Shader::Type stype = (Shader::Type)shaderKey.second;
+         string fileName = SGModelLib::findDataFile(shaderName, options);
+         if (fileName.empty())
+             throw BuilderException(string("couldn't find shader ") +
+@@ -833,7 +833,7 @@ void ShaderProgramBuilder::buildAttribute(Effect* 
effect, Pass* pass,
+     BOOST_FOREACH(const ShaderKey& skey, resolvedKey.shaders)
+     {
+         const string& fileName = skey.first;
+-        Shader::Type stype = skey.second;
++        Shader::Type stype = (Shader::Type)skey.second;
+         ShaderMap::iterator sitr = shaderMap.find(skey);
+         if (sitr != shaderMap.end()) {
+             program->addShader(sitr->second.get());
+-- 
+1.7.1
+
+
diff --git a/games-simulation/flightgear/DEPENDS 
b/games-simulation/flightgear/DEPENDS
index 157a666..b1db1bb 100755
--- a/games-simulation/flightgear/DEPENDS
+++ b/games-simulation/flightgear/DEPENDS
@@ -8,7 +8,6 @@ depends  freealut       &&
 depends  libpng         &&
 depends  libx11         &&
 depends  openscenegraph &&
-depends  openthreads    &&
 depends  plib           &&
 depends  simgear        &&
 depends  subversion     &&
diff --git a/games-simulation/flightgear/HISTORY 
b/games-simulation/flightgear/HISTORY
index 27393f3..289469a 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -1,3 +1,6 @@
+2012-08-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: removed dependency on openthreads
+
 2012-08-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.8.0