Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (639abd791d45920f3b04773df280350704a3a72f)
  • Date: Wed, 22 Feb 2012 16:00:49 -0600

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

games-data/fgfs-base/DETAILS | 8 +++----
games-data/fgfs-base/HISTORY | 3 ++
games-emulators/scummvm/DETAILS | 4 +--
games-emulators/scummvm/HISTORY | 3 ++
games-libs/simgear/BUILD | 4 ---
games-libs/simgear/CONFLICTS | 1
games-libs/simgear/DEPENDS | 4 +++
games-libs/simgear/DETAILS | 4 +--
games-libs/simgear/HISTORY | 6 +++++
games-simulation/flightgear/BUILD | 6 +----
games-simulation/flightgear/CONFLICTS | 1
games-simulation/flightgear/DEPENDS | 26
++++++++++++++----------
games-simulation/flightgear/DETAILS | 12 +++++------
games-simulation/flightgear/HISTORY | 8 +++++++
games-simulation/flightgear/PREPARE | 11 +++-------
games-simulation/flightgear/PRE_BUILD | 3 --
games-simulation/flightgear/terrasync.cxx.patch | 10 ---------
17 files changed, 61 insertions(+), 53 deletions(-)

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

games-emulators/scummvm: version 1.4.1

commit a8c2d20d10d82f740ed4065b1cee4bccaa0299f9
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.6.0

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

games-data/fgfs-data: version 2.6.0

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

games-simulation/flightgear: set data directory

commit 84f580e23f18e19327b2d287d02f261d07cbbb0f
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.6.0

diff --git a/games-data/fgfs-base/DETAILS b/games-data/fgfs-base/DETAILS
index b6cb34f..600b370 100755
--- a/games-data/fgfs-base/DETAILS
+++ b/games-data/fgfs-base/DETAILS
@@ -1,11 +1,11 @@
SPELL=fgfs-base
- VERSION=2.4.0
+ VERSION=2.6.0
SOURCE=FlightGear-data-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/FlightGear-${VERSION}
- 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[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:c1eb22bced1bab5e53f46c62a0815ceae4d449164d3fea37b1ed9ad272dd8660ef6857dd095c65fc80a6df887fd0af858db0e8ada7519c01f8049670ac43a8b4
+
SOURCE_HASH=sha512:477f6ec2c044d122ee07cd9b96c790cfcc8b487f052da60ac00c1d75d234d154cf6429c0c21a3142718a9393cc5200cb06d8aa24d0a8afd4abbdf5ac15208ce6
# 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 bda13b8..033420a 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -1,4 +1,7 @@
2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.0
+
+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
diff --git a/games-emulators/scummvm/DETAILS b/games-emulators/scummvm/DETAILS
index 9e24627..b229d30 100755
--- a/games-emulators/scummvm/DETAILS
+++ b/games-emulators/scummvm/DETAILS
@@ -15,10 +15,10 @@ if [ "$SCUMMVM_CVS" == "y" ] ; then

else

- VERSION=0.13.1
+ VERSION=1.4.1
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:cb7c21d78a21c6cf576e07153b86679bcac08b274fb558ae7c7a66825ab8f3aa896afce21bccd65163f3e43d10d22cb63727c21bea6a685691898b96d4032652
+
SOURCE_HASH=sha512:c7b3247e3e855511c3f6b10508ccbbf3b3e1228500b48476c9271d3995a4c2790dc3771ea923a159f8a9347fab56ee9eda4a29d47f5cb7af07252c02c3038157
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

fi
diff --git a/games-emulators/scummvm/HISTORY b/games-emulators/scummvm/HISTORY
index 684e389..5d0be10 100644
--- a/games-emulators/scummvm/HISTORY
+++ b/games-emulators/scummvm/HISTORY
@@ -1,3 +1,6 @@
+2012-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.1
+
2011-10-12 Bor Kraljič <pyrobor AT ver.si>
* DEPENDS: changed mpeg2dec -> libmpeg2

diff --git a/games-libs/simgear/BUILD b/games-libs/simgear/BUILD
index feceeab..e013b8d 100755
--- a/games-libs/simgear/BUILD
+++ b/games-libs/simgear/BUILD
@@ -1,3 +1 @@
-make_single &&
-default_build &&
-make_normal
+cmake_build
diff --git a/games-libs/simgear/CONFLICTS b/games-libs/simgear/CONFLICTS
deleted file mode 100755
index efa740b..0000000
--- a/games-libs/simgear/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts SimGear y
diff --git a/games-libs/simgear/DEPENDS b/games-libs/simgear/DEPENDS
index dbba636..e2114fc 100755
--- a/games-libs/simgear/DEPENDS
+++ b/games-libs/simgear/DEPENDS
@@ -1,5 +1,9 @@
depends metakit &&
depends OPENAL &&
+depends freealut &&
+depends boost &&
+depends openthreads &&
depends openscenegraph &&
+depends subversion &&
depends plib &&
depends zlib
diff --git a/games-libs/simgear/DETAILS b/games-libs/simgear/DETAILS
index c20e161..51d200d 100755
--- a/games-libs/simgear/DETAILS
+++ b/games-libs/simgear/DETAILS
@@ -1,9 +1,9 @@
SPELL=simgear
- VERSION=2.4.0
+ VERSION=2.6.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_HASH=sha512:5aee505745bb7e264cf2cfc0a05e2dcfb178ff5d8af6bf3a6ddb98c7f6dd7c2477a0fa01f43fe014cd6837045de7eafe8a2cd4e0e6ebdb42304a1a71e30ac11d
# 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 bfafe4e..1749244 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,9 @@
+2012-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.0
+ * BUILD: switched to cmake
+ * DEPENDS: added dependencies on freealut, boost, openthreads,
subversion
+ * CONFLICTS: removed
+
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
diff --git a/games-simulation/flightgear/BUILD
b/games-simulation/flightgear/BUILD
index 6d98f9f..7403cfb 100755
--- a/games-simulation/flightgear/BUILD
+++ b/games-simulation/flightgear/BUILD
@@ -1,4 +1,2 @@
-OPTS="--mandir=${INSTALL_ROOT}/usr/share/man $OPTS" &&
-make_single &&
-default_games_build &&
-make_normal
+OPTS+=" -DFG_DATA_DIR=${TRACK_ROOT}/usr/share/games/flightgear" &&
+cmake_build
diff --git a/games-simulation/flightgear/CONFLICTS
b/games-simulation/flightgear/CONFLICTS
deleted file mode 100755
index accc559..0000000
--- a/games-simulation/flightgear/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts FlightGear y
diff --git a/games-simulation/flightgear/DEPENDS
b/games-simulation/flightgear/DEPENDS
index 0ead613..157a666 100755
--- a/games-simulation/flightgear/DEPENDS
+++ b/games-simulation/flightgear/DEPENDS
@@ -1,10 +1,16 @@
-depends simgear &&
-depends fgfs-base &&
-depends subversion &&
-
-if [[ "${GRAPHIC_LIB}" == "sdl" ]]
-then
-depends sdl "--enable-sdl"
-else
-depends ${GRAPHIC_LIB}
-fi
+depends GLUT &&
+depends OPENAL &&
+depends boost &&
+depends fgfs-base &&
+depends fltk &&
+depends -sub CXX gcc &&
+depends freealut &&
+depends libpng &&
+depends libx11 &&
+depends openscenegraph &&
+depends openthreads &&
+depends plib &&
+depends simgear &&
+depends subversion &&
+depends udev &&
+depends zlib
diff --git a/games-simulation/flightgear/DETAILS
b/games-simulation/flightgear/DETAILS
index f6cff63..299cdfc 100755
--- a/games-simulation/flightgear/DETAILS
+++ b/games-simulation/flightgear/DETAILS
@@ -1,11 +1,11 @@
SPELL=flightgear
- VERSION=2.4.0
- SOURCE=FlightGear-${VERSION}.tar.bz2
+ VERSION=2.6.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_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:5e99944e1255cb097da0b06132596e06d3d88b6c81f8ac51c50b9b9a2e3f4731c619d9bea7464135d25438c3aba20392b1b17edc0b460b069246b69b1b4f5a75
# 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 462beed..ebab59a 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -1,3 +1,11 @@
+2012-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.0
+ * BUILD: switched to cmake, set data directory
+ * DEPENDS: added dependencies on GLUT, OPENAL, boost, fltk, gcc with
CXX,
+ freealut, libpng, libx11, openscenegraph, openthreads, plib, udev
and zlib
+ * CONFLICTS, PREPARE, PRE_BUILD, terrasync.cxx.patch: removed
+ * PREPARE: made flightmodels selectable
+
2012-01-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.4.0
* DEPENDS: added dependency on subversion
diff --git a/games-simulation/flightgear/PREPARE
b/games-simulation/flightgear/PREPARE
index 4bb5365..755af42 100755
--- a/games-simulation/flightgear/PREPARE
+++ b/games-simulation/flightgear/PREPARE
@@ -1,7 +1,4 @@
-if [[ "$GRAPHIC_LIB" == "openglut" || "$GRAPHIC_LIB" == "glut" ]]
-then
- GRAPHIC_LIB="GLUT"
-fi &&
-
-config_query_list GRAPHIC_LIB "Which graphics system do you wish to use"
\
- "sdl" "GLUT"
+config_query_option FG_JSBSIM "enable jsbsim?" y "-DENABLE_JSBSIM=ON"
"-DENABLE_JSBSIM=OFF" &&
+config_query_option FG_LARCSIM "enable larcsim?" n "-DENABLE_LARCSIM=ON"
"-DENABLE_LARCSIM=OFF" &&
+config_query_option FG_UIUC "enable uiuc model?" n
"-DENABLE_UIUC_MODEL=ON" "-DENABLE_UIUC_MODEL=OFF" &&
+config_query_option FG_YASIM "enable yasim?" y "-DENABLE_YASIM=ON"
"-DENABLE_YASIM=OFF"
diff --git a/games-simulation/flightgear/PRE_BUILD
b/games-simulation/flightgear/PRE_BUILD
deleted file mode 100755
index 54e643d..0000000
--- a/games-simulation/flightgear/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 738942a..0000000
--- a/games-simulation/flightgear/terrasync.cxx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (639abd791d45920f3b04773df280350704a3a72f), Florian Franzmann, 02/22/2012

Archive powered by MHonArc 2.6.24.

Top of Page