Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (19d30f501a4513631e99b1d8f8b9e3b84a790edf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master games grimoire by Florian Franzmann (19d30f501a4513631e99b1d8f8b9e3b84a790edf)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (19d30f501a4513631e99b1d8f8b9e3b84a790edf)
  • Date: Sat, 23 Feb 2013 05:24:33 -0600
GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

games-data/fgfs-base/DETAILS | 5 ++-
games-data/fgfs-base/HISTORY | 3 ++
games-libs/simgear/DEPENDS | 1
games-libs/simgear/DETAILS | 4 +--
games-libs/simgear/HISTORY | 5 +++
games-libs/simgear/PRE_BUILD | 3 --
games-libs/simgear/boost-1.51.patch | 47
------------------------------------
games-simulation/flightgear/DEPENDS | 7 ++++-
games-simulation/flightgear/DETAILS | 4 +--
games-simulation/flightgear/HISTORY | 5 +++
10 files changed, 28 insertions(+), 56 deletions(-)

New commits:
commit 19d30f501a4513631e99b1d8f8b9e3b84a790edf
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.10.0

commit fd04f4d0bb0d001bca36f12f7be4b5b8f25c570f
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.10.0

commit 7bdacb3e4834f3326509cc6e422c929634a1253b
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.10.0

diff --git a/games-data/fgfs-base/DETAILS b/games-data/fgfs-base/DETAILS
index 9ccacf4..a43aef1 100755
--- a/games-data/fgfs-base/DETAILS
+++ b/games-data/fgfs-base/DETAILS
@@ -1,15 +1,16 @@
SPELL=fgfs-base
- VERSION=2.8.0
+ VERSION=2.10.0
SOURCE=FlightGear-data-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/FlightGear-${VERSION}

SOURCE_URL[0]=ftp://ftp.linux.kiev.ua/pub/mirrors/ftp.flightgear.org/flightgear/Shared/${SOURCE}
SOURCE_URL[1]=ftp://flightgear.wo0t.de/Shared/${SOURCE}

SOURCE_URL[2]=ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Shared/${SOURCE}
-
SOURCE_HASH=sha512:ef86b636ed0393ead8e67ad13e3170790bc2373bd77556fe8ec45e55f70d6dc6380be47b8c882299bb5665362352c61c9f3d142fe17e1b76a5e5ae3d6d43dea3
+
SOURCE_HASH=sha512:e7925ebef97d8968b8cac69440c740d8addc049f99023820686bcfa10163a31ccd3902dbb0e89c2375089c8cc11b7214a1f8a261a4aea74f307af82c38dc027a
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://flightgear.sourceforge.net
ENTERED=20010922
ARCHIVE=off
+ TMPFS=off
LICENSE[0]=GPL
SHORT="Base files required by FlightGear."
cat << EOF
diff --git a/games-data/fgfs-base/HISTORY b/games-data/fgfs-base/HISTORY
index 7cd1ee6..aa35866 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -1,3 +1,6 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.10.0, TMPFS=off
+
2013-01-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.8.0

diff --git a/games-libs/simgear/DEPENDS b/games-libs/simgear/DEPENDS
index 2a99f72..c046423 100755
--- a/games-libs/simgear/DEPENDS
+++ b/games-libs/simgear/DEPENDS
@@ -1,4 +1,5 @@
depends -sub CXX gcc &&
+depends expat "-DSYSTEM_EXPAT=on" &&
depends metakit &&
depends OPENAL &&
depends freealut &&
diff --git a/games-libs/simgear/DETAILS b/games-libs/simgear/DETAILS
index a53782d..0257ba5 100755
--- a/games-libs/simgear/DETAILS
+++ b/games-libs/simgear/DETAILS
@@ -1,9 +1,9 @@
SPELL=simgear
- VERSION=2.8.0
+ VERSION=2.10.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:ead06fd394b10a7ae3c98422cc469b3c97450162f6994c40c7cb4818f88e0d25cf0b5dc9c39a10e2b9c0fd849dd322451df93e4febcbacf2fc23fe1860917064
+
SOURCE_HASH=sha512:7ec4a56af43b1ea76f54df75aea56871da0eab7e567ff238c164e7a33a5c77a7547c925c60e6426c2546394af596a2e39798ba9dd4b2758f434bd8436f8f99d8
# 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 83a661d..d9069f1 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,8 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.10.0
+ * DEPENDS: added dependency on expat
+ * boost-1.51.patch, PRE_BUILD: removed obsolete patch
+
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
diff --git a/games-libs/simgear/PRE_BUILD b/games-libs/simgear/PRE_BUILD
index 45cf5fa..aae639c 100755
--- a/games-libs/simgear/PRE_BUILD
+++ b/games-libs/simgear/PRE_BUILD
@@ -2,5 +2,4 @@ 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 &&
-patch -p1 < ${SPELL_DIRECTORY}/boost-1.51.patch
+ ${SOURCE_DIRECTORY}/simgear/structure/Singleton.hxx
diff --git a/games-libs/simgear/boost-1.51.patch
b/games-libs/simgear/boost-1.51.patch
deleted file mode 100644
index b056213..0000000
--- a/games-libs/simgear/boost-1.51.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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 b1db1bb..a1cd598 100755
--- a/games-simulation/flightgear/DEPENDS
+++ b/games-simulation/flightgear/DEPENDS
@@ -2,9 +2,14 @@ depends GLUT &&
depends OPENAL &&
depends boost &&
depends fgfs-base &&
-depends fltk &&
+depends -sub OPENGL fltk &&
depends -sub CXX gcc &&
depends freealut &&
+depends freetype2 &&
+depends JPEG &&
+depends giflib &&
+depends libxmu &&
+depends libxi &&
depends libpng &&
depends libx11 &&
depends openscenegraph &&
diff --git a/games-simulation/flightgear/DETAILS
b/games-simulation/flightgear/DETAILS
index 3d99c99..968a5dd 100755
--- a/games-simulation/flightgear/DETAILS
+++ b/games-simulation/flightgear/DETAILS
@@ -1,11 +1,11 @@
SPELL=flightgear
- VERSION=2.8.0
+ VERSION=2.10.0
SOURCE=flightgear-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/flightgear-${VERSION}

SOURCE_URL[1]=ftp://ftp.kingmont.com/flightsims/flightgear/Source/${SOURCE}

SOURCE_URL[2]=ftp://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/${SOURCE}
SOURCE_URL[3]=http://ftp.igh.cnrs.fr/pub/flightgear/ftp/Source/${SOURCE}
-
SOURCE_HASH=sha512:4d9b2584dd7c2fa4ad28d9769a9429809e420c7bf858967a5bb461f8ecb78dd079ff01c78febb95b7c3edce40dbf01e077bf7423324958e0b0a3cc74df12e1c1
+
SOURCE_HASH=sha512:b982168c893da3e97cce63b92c93af3dd684a3d3c9c56a1e8e76629388fbbf56f4d5ad25013230094b701fef1bc70793c6a103b8bfe381e671d9f7ba0e2e8423
# 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 289469a..a8a08ac 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -1,3 +1,8 @@
+2013-02-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.10.0
+ * DEPENDS: added sub dependency on OPENGL for fltk, added
+ dependencies on freetype2, JPEG, giflib, libxmu, libxi
+
2012-08-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: removed dependency on openthreads



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (19d30f501a4513631e99b1d8f8b9e3b84a790edf), Florian Franzmann, 02/23/2013

Archive powered by MHonArc 2.6.24.

Top of Page