Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Mathieu Lonjaret (371e5f6b590d0f23eeec46dd21afa7fb16f12afb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Mathieu Lonjaret <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Mathieu Lonjaret (371e5f6b590d0f23eeec46dd21afa7fb16f12afb)
  • Date: Wed, 3 Sep 2008 13:31:14 -0500

GIT changes to master games grimoire by Mathieu Lonjaret
<lejatorn@oenone.(none)>:

games-simulation/vegastrike/BUILD | 17 ++++----
games-simulation/vegastrike/CONFIGURE | 3 -
games-simulation/vegastrike/DEPENDS | 23 +++++++----
games-simulation/vegastrike/DETAILS | 24 +++++++----
games-simulation/vegastrike/FINAL | 3 -
games-simulation/vegastrike/HISTORY | 4 +
games-simulation/vegastrike/INSTALL | 70
+++++++++++++++++++---------------
games-simulation/vegastrike/PRE_BUILD | 29 ++++++--------
games-simulation/vegastrike/vsinstall | 16 +++----
9 files changed, 109 insertions(+), 80 deletions(-)

New commits:
commit 371e5f6b590d0f23eeec46dd21afa7fb16f12afb
Author: Mathieu Lonjaret <lejatorn@oenone.(none)>
Commit: Mathieu Lonjaret <lejatorn@oenone.(none)>

vegastrike: update to 0.5.0

diff --git a/games-simulation/vegastrike/BUILD
b/games-simulation/vegastrike/BUILD
index 0710544..47d56f1 100755
--- a/games-simulation/vegastrike/BUILD
+++ b/games-simulation/vegastrike/BUILD
@@ -1,12 +1,13 @@
-if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-cd ${SPELL}-svn
-else
-cd ${SPELL}-${VERSION}
-fi
+#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
+#cd ${SPELL}-svn
+#else
+#cd ${SPELL}-${VERSION}
+#fi
+#OPTS="$VS_OPTS --datadir=/usr/share/games/vegastrike/data${VERSION2} $OPTS"
if [[ $VEGASTRIKE_DEBUG == "n" ]]; then
-OPTS="--enable-release --disable-debug $OPTS"
+ OPTS="--enable-release --disable-debug $OPTS"
else
-OPTS="--disable-release --enable-debug $OPTS"
+ OPTS="--disable-release --enable-debug $OPTS"
fi
-OPTS="$VS_OPTS --datadir=/usr/share/games/vegastrike/data${VERSION2} $OPTS"
+OPTS="$VS_OPTS --datadir=${INSTALL_ROOT}/usr/share/games/vegastrike/$VERSION
$OPTS"
default_games_build
diff --git a/games-simulation/vegastrike/CONFIGURE
b/games-simulation/vegastrike/CONFIGURE
index 57e29a0..c8d82d4 100755
--- a/games-simulation/vegastrike/CONFIGURE
+++ b/games-simulation/vegastrike/CONFIGURE
@@ -1,5 +1,6 @@
config_query VEGASTRIKE_DEBUG "Do you want to build debug version?" n &&
+#passing --disable actually enables it :/
config_query_option VS_OPTS \
"Do you want support for stencil buffer?" n \
"--enable-stencil-buffer" \
- "--disable-stencil-buffer"
+ ""
diff --git a/games-simulation/vegastrike/DEPENDS
b/games-simulation/vegastrike/DEPENDS
index 847081a..bd11139 100755
--- a/games-simulation/vegastrike/DEPENDS
+++ b/games-simulation/vegastrike/DEPENDS
@@ -1,10 +1,11 @@
-depends SVN &&
depends sdl_mixer &&
depends automake &&
depends autoconf &&
depends expat &&
depends gtk+2 &&
-depends GLUT &&
+#does not work with openglut
+#depends GLUT
+depends freeglut &&
depends OPENGL &&
depends X11-LIBS &&
depends python &&
@@ -13,17 +14,25 @@ depends libpng &&
depends jpeg &&
depends perl &&
depends openal &&
+#--with-boost-system makes it fail here
+#depends -sub PYTHON boost "--with-boost=system" &&
+depends -sub PYTHON boost "" &&
if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
+ depends SVN
+fi &&
+#passing --enable actually disables for ogre and cegui :/
optional_depends ogre \
- "--enable-ogre" \
+ "" \
"--disable-ogre" \
"Enable mesher" &&
optional_depends cegui \
- "--enable-cegui" \
+ "" \
"--disable-cegui" \
- "Enable cegui"
-fi &&
-depends -sub PYTHON boost "--with-boost=system" &&
+ "Enable cegui" &&
+optional_depends libvorbis \
+ "" \
+ "--disable-vorbis" \
+ "Enable ingame ogg support" &&
optional_depends blender \
"" \
"" \
diff --git a/games-simulation/vegastrike/DETAILS
b/games-simulation/vegastrike/DETAILS
index 5a60dfa..d192f4c 100755
--- a/games-simulation/vegastrike/DETAILS
+++ b/games-simulation/vegastrike/DETAILS
@@ -1,16 +1,22 @@
SPELL=vegastrike
VERSION2=4.x
if [[ $VEGASTRIKE_DEVEL == "n" ]]; then
- VERSION="0_4_3"
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE2=$SPELL-data$VERSION2-$VERSION.tar.bz2
+ VERSION=0.5.0
+# SOURCE=$SPELL-$VERSION.tar.bz2
+# SOURCE2=$SPELL-data$VERSION2-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_HINTS=old_svn_compat
- SOURCE2_HINTS=old_svn_compat
-
SOURCE_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/vegastrike:vegastrike-$VERSION
-
SOURCE2_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/data$VERSION2:vegastrike-data$VERSION2-$VERSION
- SOURCE_IGNORE=volatile
- SOURCE2_IGNORE=volatile
+# SOURCE_HINTS=old_svn_compat
+# SOURCE2_HINTS=old_svn_compat
+#
SOURCE_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/vegastrike:vegastrike-$VERSION
+#
SOURCE2_URL=svn://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_$VERSION/data$VERSION2:vegastrike-data$VERSION2-$VERSION
+# SOURCE_IGNORE=volatile
+# SOURCE2_IGNORE=volatile
+ SOURCE=$SPELL-source-$VERSION.tar.bz2
+ SOURCE2=$SPELL-linux-$VERSION.tar.bz2
+ SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
+ SOURCE2_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE2
+
SOURCE_HASH=sha512:d0088df1f49b8600e1e6dc8b216001b0302de19675ba8da6ec0761b55d15624ffb6a8689f40593b844b89eee7d76202ba421a30d498d5d2ac54b66ccd576dd31
+
SOURCE2_HASH=sha512:5c4bebd323809c03a59827970e49fc160f9dad059ef46dd3b708c3dfe59f2e1edadce510dd65f461b953b4aee78825edaa714a9d07556b65b4675da084836c5a
else
if [[ $VEGASTRIKE_UPDATE == "y" ]]; then
VERSION=$(date +%Y-%m-%d)
diff --git a/games-simulation/vegastrike/FINAL
b/games-simulation/vegastrike/FINAL
index abf456d..c03c6b6 100755
--- a/games-simulation/vegastrike/FINAL
+++ b/games-simulation/vegastrike/FINAL
@@ -1,6 +1,5 @@
message "*****************************************************"
message "*****************************************************"
-message "You need to run vsinstall before doing anything else."
-message "Then you can launch the game with vslauncher."
+message "You need to run vsinstall before starting the game."
message "*****************************************************"
message "*****************************************************"
diff --git a/games-simulation/vegastrike/HISTORY
b/games-simulation/vegastrike/HISTORY
index 7f7defb..19f209f 100644
--- a/games-simulation/vegastrike/HISTORY
+++ b/games-simulation/vegastrike/HISTORY
@@ -1,3 +1,7 @@
+2008-09-03 Mathieu Lonjaret <lejatorn AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, FINAL, INSTALL, PRE_BUILD,
+ vsinstall: update to 0.5.0 (devel disabled atm)
+
2008-01-28 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: removed is_depends_enabled.function reference

diff --git a/games-simulation/vegastrike/INSTALL
b/games-simulation/vegastrike/INSTALL
index d8ed1ab..1598dda 100755
--- a/games-simulation/vegastrike/INSTALL
+++ b/games-simulation/vegastrike/INSTALL
@@ -1,34 +1,44 @@
-mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
-if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-install -v -o root -g games -m 0750 \
- ${SOURCE_DIRECTORY}/vegastrike-svn/vssetup \
- ${INSTALL_ROOT}/usr/games &&
-cp -vR ${SOURCE_DIRECTORY}/$SPELL-data$VERSION2-svn/* \
- ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
-cd ${SOURCE_DIRECTORY}/vegastrike-svn
-else
-install -v -o root -g games -m 0750 \
- ${SOURCE_DIRECTORY}/vegastrike-$VERSION/vssetup \
- ${INSTALL_ROOT}/usr/games &&
-cp -vR ${SOURCE_DIRECTORY}/$SPELL-data$VERSION2-$VERSION/* \
- ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
-cd ${SOURCE_DIRECTORY}/vegastrike-$VERSION
-fi
-default_install &&
-mv ${INSTALL_ROOT}/usr/games/vegastrike \
- ${INSTALL_ROOT}/usr/games/vegastrike-bin &&
-cp -v ${SPELL_DIRECTORY}/vsinstall ${INSTALL_ROOT}/usr/games &&
-if is_depends_enabled $SPELL blender; then
- for i in import export; do
- install -m 755 \
- ${SOURCE_DIRECTORY}/$SPELL-svn/objconv/blender_xmesh_${i}.py \
- ${INSTALL_ROOT}/usr/share/blender/scripts/${i}_xmesh.py
- done
-fi
-cd ${INSTALL_ROOT}/usr/share/games/vegastrike &&
-find_and_scam &&
+#mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
+#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
+#install -v -o root -g games -m 0750 \
+# ${SOURCE_DIRECTORY}/vegastrike-svn/vssetup \
+# ${INSTALL_ROOT}/usr/games &&
+#cp -vR ${SOURCE_DIRECTORY}/$SPELL-data$VERSION2-svn/* \
+# ${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION2 &&
+#cd ${SOURCE_DIRECTORY}/vegastrike-svn
+#else
+#fi
+mkdir -vp ${INSTALL_ROOT}/usr/share/games/vegastrike/ &&
+cd ${INSTALL_ROOT}/usr/share/games/vegastrike/ &&
+unpack_file 2 &&
+mv $SPELL-$VERSION $VERSION &&
+install -v -o root -g games -m 0750 \
+ ${SOURCE_DIRECTORY}/vssetup \
+ ${SOURCE_DIRECTORY}/mesher \
+ ${SOURCE_DIRECTORY}/vegaserver \
+ ${SOURCE_DIRECTORY}/vegastrike \
+ ${INSTALL_ROOT}/usr/games &&
+mv ${INSTALL_ROOT}/usr/games/vegastrike \
+ ${INSTALL_ROOT}/usr/games/vegastrike-bin &&
+install -v -o root -g games -m 0750 \
+ ${SPELL_DIRECTORY}/vsinstall \
+ ${INSTALL_ROOT}/usr/games &&
+#if is_depends_enabled $SPELL blender; then
+# for i in import export; do
+# install -m 755 \
+# ${SOURCE_DIRECTORY}/$SPELL-svn/objconv/blender_xmesh_${i}.py \
+# ${INSTALL_ROOT}/usr/share/blender/scripts/${i}_xmesh.py
+# done
+#fi
+cd ${INSTALL_ROOT}/usr/share/games/vegastrike &&
+find_and_scam &&
+touch ${INSTALL_ROOT}/usr/games/vegastrike &&
+chown root:games ${INSTALL_ROOT}/usr/games/vegastrike &&
+chmod 0750 ${INSTALL_ROOT}/usr/games/vegastrike &&
cat > ${INSTALL_ROOT}/usr/games/vegastrike << EOF
#!/bin/sh

-vegastrike-bin -d${INSTALL_ROOT}/usr/share/games/vegastrike/data$VERSION
+cd ${INSTALL_ROOT}/usr/share/games/vegastrike/$VERSION
+/usr/games/vegastrike-bin
EOF
+
diff --git a/games-simulation/vegastrike/PRE_BUILD
b/games-simulation/vegastrike/PRE_BUILD
index e0eeac8..830cd95 100755
--- a/games-simulation/vegastrike/PRE_BUILD
+++ b/games-simulation/vegastrike/PRE_BUILD
@@ -1,15 +1,14 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file &&
-unpack_file 2 &&
-if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
-cd ${SOURCE_DIRECTORY}/vegastrike-svn &&
-sedit 's/lboost_python-st/lboost_python/' Makefile.{am,in} &&
-./bootstrap-sh
-else
-cd ${SOURCE_DIRECTORY}/vegastrike-${VERSION} &&
-aclocal &&
-autoconf -f &&
-autoheader -f &&
-automake -acf
-fi
+#mk_source_dir $SOURCE_DIRECTORY &&
+#if [[ $VEGASTRIKE_DEVEL == "y" ]]; then
+# cd ${SOURCE_DIRECTORY}/vegastrike-svn &&
+# sedit 's/lboost_python-st/lboost_python/' Makefile.{am,in}
+#fi
+#aclocal &&
+#autoconf -f &&
+#autoheader -f &&
+#automake -acf
+
+cd $BUILD_DIRECTORY &&
+unpack_file &&
+cd ${SOURCE_DIRECTORY} &&
+./bootstrap-sh
\ No newline at end of file
diff --git a/games-simulation/vegastrike/vsinstall
b/games-simulation/vegastrike/vsinstall
index ae44665..9fe17bd 100755
--- a/games-simulation/vegastrike/vsinstall
+++ b/games-simulation/vegastrike/vsinstall
@@ -2,13 +2,13 @@

mkdir -p ${HOME}/.vegastrike
cd ${HOME}/.vegastrike
-if [ -e save.4.x.txt ] ; then
- touch save.4.x.txt;
-else
- echo "default"> save.4.x.txt ;
- mkdir -p ${HOME}/.vegastrike/save
- cp save.4.x.txt save/
-fi
-cp
/usr/share/games/vegastrike/data4.x/{setup.config,.vegastrike/*.m3u,vegastrike.config}
.
+#if [ -e save.4.x.txt ] ; then
+# touch save.4.x.txt;
+#else
+# echo "default"> save.4.x.txt ;
+# mkdir -p ${HOME}/.vegastrike/save
+# cp save.4.x.txt save/
+#fi
+cp
/usr/share/games/vegastrike/0.5.0/{setup.config,.vegastrike-0.5.0/*.m3u,vegastrike.config}
.
/usr/games/vssetup





Archive powered by MHonArc 2.6.24.

Top of Page