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-data/fgfs-base/DETAILS                    |    9 +-
 games-data/fgfs-base/HISTORY                    |    5 +
 games-data/fgfs-base/INSTALL                    |    4 
 games-libs/simgear/DETAILS                      |   12 +-
 games-libs/simgear/HISTORY                      |    5 +
 games-libs/simgear/INSTALL                      |    2 
 games-libs/simgear/PRE_BUILD                    |    5 +
 games-libs/simgear/singleton.hpp                |  107 
++++++++++++++++++++++++
 games-simulation/flightgear/DEPENDS             |    1 
 games-simulation/flightgear/DETAILS             |   15 +--
 games-simulation/flightgear/HISTORY             |    6 +
 games-simulation/flightgear/PRE_BUILD           |    3 
 games-simulation/flightgear/terrasync.cxx.patch |   10 ++
 13 files changed, 163 insertions(+), 21 deletions(-)

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

    games-simulation/flightgear: version 2.4.0

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

    games-libs/simgear: version 2.4.0

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

    games-data/fgfs-base: version 2.4.0

diff --git a/games-data/fgfs-base/DETAILS b/games-data/fgfs-base/DETAILS
index b0acd68..b6cb34f 100755
--- a/games-data/fgfs-base/DETAILS
+++ b/games-data/fgfs-base/DETAILS
@@ -1,10 +1,11 @@
            SPELL=fgfs-base
-         VERSION=2.0.0
+         VERSION=2.4.0
           SOURCE=FlightGear-data-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/FlightGear-${VERSION}
-   SOURCE_URL[0]=ftp://ftp.flightgear.org/pub/fgfs/Shared/${SOURCE}
-   
SOURCE_URL[1]=ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org/Shared/${SOURCE}
-     
SOURCE_HASH=sha512:224de99e2df75bf4958cd64eee8d82e9699fac4ed79669932d9f87146f20b6a5855c4bf20b8fae7ad196bbf6282cdaca932084b057569b7adcbbf6db13763f09
+   SOURCE_URL[0]=ftp://ftp.de.flightgear.org/pub/fgfs/Shared/${SOURCE}
+   SOURCE_URL[1]=http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Shared/${SOURCE}
+   
SOURCE_URL[2]=ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/${SOURCE}
+     
SOURCE_HASH=sha512:c1eb22bced1bab5e53f46c62a0815ceae4d449164d3fea37b1ed9ad272dd8660ef6857dd095c65fc80a6df887fd0af858db0e8ada7519c01f8049670ac43a8b4
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
         WEB_SITE=http://flightgear.sourceforge.net
          ENTERED=20010922
diff --git a/games-data/fgfs-base/HISTORY b/games-data/fgfs-base/HISTORY
index 637f622..bda13b8 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -1,3 +1,8 @@
+2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.4.0
+       * INSTALL: install to /usr/share/games/flightgear, which is
+         where flightgear expects the data to be
+
 2011-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.0.0
 
diff --git a/games-data/fgfs-base/INSTALL b/games-data/fgfs-base/INSTALL
index 8962eeb..bfc230f 100755
--- a/games-data/fgfs-base/INSTALL
+++ b/games-data/fgfs-base/INSTALL
@@ -1,3 +1,3 @@
-mkdir  -p  /usr/share/games/FlightGear   &&
+mkdir  -p  /usr/share/games/flightgear   &&
 cd  ${SOURCE_DIRECTORY}/data             &&
-cp  -rv  *  /usr/share/games/FlightGear
+cp  -rv  *  /usr/share/games/flightgear
diff --git a/games-libs/simgear/DETAILS b/games-libs/simgear/DETAILS
index 77b6a93..c20e161 100755
--- a/games-libs/simgear/DETAILS
+++ b/games-libs/simgear/DETAILS
@@ -1,11 +1,9 @@
            SPELL=simgear
-         VERSION=2.0.0
-          SOURCE=SimGear-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/SimGear-$VERSION
-   SOURCE_URL[0]=ftp://ftp.simgear.org/pub/simgear/Source/$SOURCE
-   
SOURCE_URL[1]=ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.simgear.org/Source/$SOURCE
-   
SOURCE_URL[2]=ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.simgear.org/Source/$SOURCE
-     
SOURCE_HASH=sha512:71c2ec01ab72c663bcffd273250c87d3bbe73cd8197c1483beb209b885960d6020e478c2a059b97710b732bd3506fe9c4b749d09d87378ddff13e29ec25beaca
+         VERSION=2.4.0
+          SOURCE=simgear-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/simgear-$VERSION
+   
SOURCE_URL[0]=http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/${SOURCE}
+     
SOURCE_HASH=sha512:edd764d7304a595361db1bdfd68e7e3314f8e9d7198f71792ca7976d953d13123d5e92dec8b3295134bf56b01cfb198b1f867a6f93cb56b947db72597e841414
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
         WEB_SITE=http://simgear.sourceforge.net
          ENTERED=20010922
diff --git a/games-libs/simgear/HISTORY b/games-libs/simgear/HISTORY
index e2f5046..bfafe4e 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,8 @@
+2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.4.0
+       * PRE_BUILD, INSTALL, singleton.hpp: use header file from older
+         version of boost to work around compile error
+
 2011-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.0.0
        * DEPENDS: openal -> OPENAL, added missing dependency on zlib
diff --git a/games-libs/simgear/INSTALL b/games-libs/simgear/INSTALL
new file mode 100755
index 0000000..ab1faf3
--- /dev/null
+++ b/games-libs/simgear/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install -m644 ${SCRIPT_DIRECTORY}/singleton.hpp 
${INSTALL_ROOT}/usr/include/simgear/structure/
diff --git a/games-libs/simgear/PRE_BUILD b/games-libs/simgear/PRE_BUILD
new file mode 100755
index 0000000..aae639c
--- /dev/null
+++ b/games-libs/simgear/PRE_BUILD
@@ -0,0 +1,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
diff --git a/games-libs/simgear/singleton.hpp 
b/games-libs/simgear/singleton.hpp
new file mode 100644
index 0000000..db7ca67
--- /dev/null
+++ b/games-libs/simgear/singleton.hpp
@@ -0,0 +1,107 @@
+// Copyright (C) 2000 Stephen Cleary
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+//
+// See http://www.boost.org for updates, documentation, and revision history.
+
+#ifndef BOOST_POOL_SINGLETON_HPP
+#define BOOST_POOL_SINGLETON_HPP
+
+// The following code might be put into some Boost.Config header in a later 
revision
+#ifdef __BORLANDC__
+# pragma option push -w-inl
+#endif
+
+//
+// The following helper classes are placeholders for a generic "singleton"
+//  class.  The classes below support usage of singletons, including use in
+//  program startup/shutdown code, AS LONG AS there is only one thread
+//  running before main() begins, and only one thread running after main()
+//  exits.
+//
+// This class is also limited in that it can only provide singleton usage for
+//  classes with default constructors.
+//
+
+// The design of this class is somewhat twisted, but can be followed by the
+//  calling inheritance.  Let us assume that there is some user code that
+//  calls "singleton_default<T>::instance()".  The following (convoluted)
+//  sequence ensures that the same function will be called before main():
+//    instance() contains a call to create_object.do_nothing()
+//    Thus, object_creator is implicitly instantiated, and create_object
+//      must exist.
+//    Since create_object is a static member, its constructor must be
+//      called before main().
+//    The constructor contains a call to instance(), thus ensuring that
+//      instance() will be called before main().
+//    The first time instance() is called (i.e., before main()) is the
+//      latest point in program execution where the object of type T
+//      can be created.
+//    Thus, any call to instance() will auto-magically result in a call to
+//      instance() before main(), unless already present.
+//  Furthermore, since the instance() function contains the object, instead
+//  of the singleton_default class containing a static instance of the
+//  object, that object is guaranteed to be constructed (at the latest) in
+//  the first call to instance().  This permits calls to instance() from
+//  static code, even if that code is called before the file-scope objects
+//  in this file have been initialized.
+
+namespace boost {
+
+namespace details {
+namespace pool {
+
+// T must be: no-throw default constructible and no-throw destructible
+template <typename T>
+struct singleton_default
+{
+  private:
+    struct object_creator
+    {
+      // This constructor does nothing more than ensure that instance()
+      //  is called before main() begins, thus creating the static
+      //  T object before multithreading race issues can come up.
+      object_creator() { singleton_default<T>::instance(); }
+      inline void do_nothing() const { }
+    };
+    static object_creator create_object;
+
+    singleton_default();
+
+  public:
+    typedef T object_type;
+
+    // If, at any point (in user code), singleton_default<T>::instance()
+    //  is called, then the following function is instantiated.
+    static object_type & instance()
+    {
+      // This is the object that we return a reference to.
+      // It is guaranteed to be created before main() begins because of
+      //  the next line.
+      static object_type obj;
+
+      // The following line does nothing else than force the instantiation
+      //  of singleton_default<T>::create_object, whose constructor is
+      //  called before main() begins.
+      create_object.do_nothing();
+
+      return obj;
+    }
+};
+template <typename T>
+typename singleton_default<T>::object_creator
+singleton_default<T>::create_object;
+
+} // namespace pool
+} // namespace details
+
+} // namespace boost
+
+// The following code might be put into some Boost.Config header in a later 
revision
+#ifdef __BORLANDC__
+# pragma option pop
+#endif
+
+#endif
diff --git a/games-simulation/flightgear/DEPENDS 
b/games-simulation/flightgear/DEPENDS
index a492cd7..0ead613 100755
--- a/games-simulation/flightgear/DEPENDS
+++ b/games-simulation/flightgear/DEPENDS
@@ -1,5 +1,6 @@
 depends  simgear       &&
 depends  fgfs-base     &&
+depends  subversion &&
 
 if [[ "${GRAPHIC_LIB}" == "sdl" ]]
 then
diff --git a/games-simulation/flightgear/DETAILS 
b/games-simulation/flightgear/DETAILS
index 6e6fdb4..f6cff63 100755
--- a/games-simulation/flightgear/DETAILS
+++ b/games-simulation/flightgear/DETAILS
@@ -1,12 +1,11 @@
            SPELL=flightgear
-         VERSION=2.0.0
-          SOURCE=FlightGear-${VERSION}.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/FlightGear-${VERSION}
-   SOURCE_URL[0]=ftp://ftp.flightgear.org/pub/fgfs/Source/${SOURCE}
-   
SOURCE_URL[1]=ftp://ftp.ihg.uni-duisburg.de/Mirrors/ftp.flightgear.org/Source/${SOURCE}
-   SOURCE_URL[2]=ftp://ftp.de.flightgear.org/pub/fgfs/Source/${SOURCE}
-   
SOURCE_URL[3]=ftp://ftp.sunsite.org.uk/sites/ftp.flightgear.org/flightgear-ftp/Source/${SOURCE}
-     
SOURCE_HASH=sha512:1084039366885a3bc11493755b743add0a16b3052597e0e3bb3ca67f4d8ce2350f41be86b7fb44bafeeee2bd41b67b2de536557626a7978907c2907b52df78a6
+         VERSION=2.4.0
+          SOURCE=FlightGear-${VERSION}.tar.bz2
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/flightgear-${VERSION}
+   SOURCE_URL[1]=http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${SOURCE}
+   SOURCE_URL[2]=ftp://flightgear.wo0t.de/flightgear-ftp/ftp/Source/${SOURCE}
+   
SOURCE_URL[3]=ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Source/${SOURCE}
+     
SOURCE_HASH=sha512:e1a2618891606f16d35db501cc7f08f226fb53da25a669f0b426fbec84a36538b483c7178dbdc35f988f0b0344d3dbd7c403601afcdba6d465255f827fc4a8f0
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
         WEB_SITE=http://www.flightgear.org
          ENTERED=20010922
diff --git a/games-simulation/flightgear/HISTORY 
b/games-simulation/flightgear/HISTORY
index 78094f7..462beed 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -1,3 +1,9 @@
+2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.4.0
+       * DEPENDS: added dependency on subversion
+       * terrasync.cxx.patch, PRE_BUILD: fix compilation error with
+         subversion 1.7
+
 2011-03-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.0.0
 
diff --git a/games-simulation/flightgear/PRE_BUILD 
b/games-simulation/flightgear/PRE_BUILD
new file mode 100755
index 0000000..54e643d
--- /dev/null
+++ b/games-simulation/flightgear/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build      &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/terrasync.cxx.patch
diff --git a/games-simulation/flightgear/terrasync.cxx.patch 
b/games-simulation/flightgear/terrasync.cxx.patch
new file mode 100644
index 0000000..738942a
--- /dev/null
+++ b/games-simulation/flightgear/terrasync.cxx.patch
@@ -0,0 +1,10 @@
+--- utils/TerraSync/terrasync.cxx.old   2011-10-18 20:31:14.893605854 +0200
++++ utils/TerraSync/terrasync.cxx       2011-10-18 20:32:58.580593547 +0200
+@@ -61,6 +61,7 @@
+ #    include <svn_client.h>
+ #    include <svn_cmdline.h>
+ #    include <svn_pools.h>
++#    include <svn_version.h>
+ #  else
+ #    undef HAVE_SVN_CLIENT_H
+ #  endif