Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (59d268349e595752f70c3f4bace83249f8775efc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andra?? Levstik <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (59d268349e595752f70c3f4bace83249f8775efc)
  • Date: Sun, 10 Dec 2006 17:39:17 -0600

GIT changes to master games grimoire by Andra?? Levstik <ruskie AT mages.ath.cx>:

games-engines/stratagus/DEPENDS | 3
games-engines/stratagus/DETAILS | 7
games-engines/stratagus/HISTORY | 7
games-engines/stratagus/PRE_BUILD | 7
games-engines/stratagus/configure.in | 255
++++++++++++++++++++++++++++++++
games-engines/stratagus/widgets.h.patch | 19 ++
games-strategy-rts/bos/BUILD | 2
games-strategy-rts/bos/DETAILS | 13 -
games-strategy-rts/bos/HISTORY | 5
games-strategy-rts/bos/INSTALL | 2
10 files changed, 306 insertions(+), 14 deletions(-)

New commits:
commit 59d268349e595752f70c3f4bace83249f8775efc
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

bos: forgot HISTORY

commit a0b365523ce6b8a579a8687e4df7e86944cd925a
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

bos: version update

commit 26a2964f35cfac8615751f71d1816ce8e49a883d
Author: Andra?? Levstik <ruskie AT mages.ath.cx>
Commit: Andra?? Levstik <ruskie AT mages.ath.cx>

stratagus: version update and bugfixes

diff --git a/games-engines/stratagus/DEPENDS b/games-engines/stratagus/DEPENDS
index d8ef858..de225cf 100755
--- a/games-engines/stratagus/DEPENDS
+++ b/games-engines/stratagus/DEPENDS
@@ -1,6 +1,7 @@
-depends lua &&
+depends lua50 &&
depends libpng &&
depends sdl &&
+depends zlib &&

optional_depends OPENGL \
"--with-opengl" \
diff --git a/games-engines/stratagus/DETAILS b/games-engines/stratagus/DETAILS
index 1e7e05f..d647dd7 100755
--- a/games-engines/stratagus/DETAILS
+++ b/games-engines/stratagus/DETAILS
@@ -1,12 +1,11 @@
SPELL=stratagus
- VERSION=2.1
+ VERSION=061209
SOURCE=$SPELL-$VERSION-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-040702
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/stratagus/$SOURCE
WEB_SITE=http://stratagus.sf.net
ENTERED=20040718
- UPDATED=20040718
-
SOURCE_HASH=sha512:d2a486f9650bdfd997e3815f113483c8409e9320dd642554ac1fee8644f94da3f44da64367a2967d32f78118fbd94cc87b36c351346f182755269bc7156c21fd
+
SOURCE_HASH=sha512:02972dc63fa1d211aee6eb34aae6457f689064f89c013c6d042547475e88d6bd8899108da5d0ff3cf069428c94026e3c19b546fc8bd12493a9f3c34d419aeed9
LICENSE[0]=GPL
SHORT='A real-time strategy game engine'
cat << EOF
diff --git a/games-engines/stratagus/HISTORY b/games-engines/stratagus/HISTORY
index dd3a217..72d659b 100644
--- a/games-engines/stratagus/HISTORY
+++ b/games-engines/stratagus/HISTORY
@@ -1,3 +1,10 @@
+2006-12-10 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: update to 2.2 aka 061209
+ * DEPENDS: re-added zlib, explicit depends
+ * configure.in: added for a stupid check
+ * PRE_BUILD: added to apply the above fix
+ * widgets.h.patch: added for another fix
+
2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-engines/stratagus/PRE_BUILD
b/games-engines/stratagus/PRE_BUILD
new file mode 100755
index 0000000..8aafa36
--- /dev/null
+++ b/games-engines/stratagus/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+cp $SPELL_DIRECTORY/configure.in \
+ $SOURCE_DIRECTORY/configure.in &&
+patch -p0 < $SPELL_DIRECTORY/widgets.h.patch &&
+./autogen.sh
diff --git a/games-engines/stratagus/configure.in
b/games-engines/stratagus/configure.in
new file mode 100644
index 0000000..44d4ab0
--- /dev/null
+++ b/games-engines/stratagus/configure.in
@@ -0,0 +1,255 @@
+
+AC_INIT(configure.in)
+AC_PREREQ([2.50])
+
+CXXFLAGS=$CXXFLAGS
+AC_PROG_CXX
+AM_CONFIG_HEADER(config.h)
+
+OBJDIR=obj
+if test "`uname -a | grep -is cygwin`" -o "`uname -a | grep -is mingw`"; then
+ ARCH=win32
+ OBJDIR=winobj
+ CPPFLAGS="$CPPFLAGS -DUSE_WIN32"
+elif test "`uname -a | grep -is bsd`"; then
+ ARCH=bsd
+ CPPFLAGS="$CPPFLAGS -DBSD"
+elif test "`uname -a | grep -is beos`"; then
+ ARCH=beos
+ CPPFLAGS="$CPPFLAGS -DUSE_BEOS"
+elif test "`uname -a | grep -is darwin`"; then
+ ARCH=macosx
+ CPPFLAGS="$CPPFLAGS -DUSE_MAC"
+else
+ ARCH=linux
+fi
+
+if test "$ARCH" = "bsd" ; then
+ CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/local/include"
+ LIBS="$LIBS -L/usr/local/lib"
+fi
+
+if test "$ARCH" = "macosx" ; then
+ if test -d /usr/local/include; then
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ fi
+ if test -d /usr/local/lib; then
+ LIBS="$LIBS -L/usr/local/lib"
+ fi
+
+ if test -d /sw/include; then
+ CPPFLAGS="$CPPFLAGS -I/sw/include"
+ fi
+ if test -d /sw/lib; then
+ LIBS="$LIBS -L/sw/lib"
+ fi
+
+ if test -d /opt/local/include; then
+ CPPFLAGS="$CPPFLAGS -I/opt/local/include"
+ fi
+ if test -d /opt/local/lib; then
+ LIBS="$LIBS -L/opt/local/lib"
+ fi
+fi
+
+if test -d /usr/include/lua50; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/lua50"
+fi
+
+AC_CHECK_FUNCS(strcasestr)
+AC_CHECK_FUNCS(strnlen)
+
+AC_PATH_X
+if test "$no_x" != "yes"; then
+ if test "x$x_includes" != "x"; then
+ CPPFLAGS="$CPPFLAGS -I$x_includes"
+ fi
+ if test "x$x_libraries" != "x"; then
+ LDFLAGS="$LDFLAGS -L$x_libraries"
+ fi
+ AC_DEFINE(HAVE_X, 1, Define to 1 if you have X. Used for pasting from
the clipboard.)
+fi
+
+AC_CHECK_HEADER(zlib.h,, AC_MSG_ERROR(could not find zlib.h))
+AC_CHECK_HEADER(png.h,, AC_MSG_ERROR(could not find png.h))
+
+AC_ARG_ENABLE(win32,
+ [ --enable-win32 Force win32, useful for cross-compiling
(default: no)])
+if test "$enable_win32" = "yes"; then
+ ARCH=win32
+ OBJDIR=winobj
+ CPPFLAGS="$CPPFLAGS -DUSE_WIN32"
+ PATH="/usr/local/cross/bin:$PATH"
+fi
+
+AC_SUBST(OBJDIR)
+
+AC_ARG_ENABLE(static,
+ [ --enable-static Compile a static binary (default: no)])
+if test "$enable_static" = "yes"; then
+ LDFLAGS="$LDFLAGS -static"
+fi
+
+AC_ARG_ENABLE(profile,
+ [ --enable-profile Enable profiling support, implies
--enable-debug (default: no)])
+if test "$enable_profile" = "yes"; then
+ CXXFLAGS="-pg"
+fi
+
+AC_ARG_ENABLE(debug,
+ [ --enable-debug [Enable debug (default: no)]])
+if test "$enable_debug" != "yes" -a "$enable_profile" != "yes"; then
+ CXXFLAGS="$CXXFLAGS"
+else
+ CXXFLAGS="$CXXFLAGS"
+ CPPFLAGS="$CPPFLAGS -DDEBUG"
+fi
+
+dnl --- EXTRA DIRS -------------
+AC_ARG_WITH(extra-includes,
+ [ --with-extra-includes=DIR [Location of additional include
directiories]], CPPFLAGS="$CPPFLAGS -I$withval")
+AC_ARG_WITH(extra-libs,
+ [ --with-extra-libs=DIR [Location of additional library
directories]], LDFLAGS="$LDFLAGS -L$withval")
+
+dnl --- OPENGL -----------------
+AC_ARG_WITH(opengl,
+ [ --with-opengl [Use opengl (default: no)]],,
with_opengl="no")
+if test "$with_opengl" != "no"; then
+ CPPFLAGS="$CPPFLAGS -DUSE_OPENGL"
+
+ if test "$ARCH" = "win32"; then
+ AC_CHECK_LIB(opengl32, main, LDFLAGS="$LDFLAGS -lopengl32",
AC_MSG_ERROR(opengl libraries cannot be not found))
+ else
+ AC_SEARCH_LIBS(glViewport, GL opengl32 sdl, LDFLAGS="$LDFLAGS
$LIBS", AC_MSG_ERROR(opengl libraries cannot be not found))
+ fi
+fi
+
+dnl --- BZIP2 ------------------
+AC_ARG_WITH(bzip2,
+ [ --with-bzip2 [Use bzip2 (default: yes)]])
+if test "$with_bzip2" != "no"; then
+ AC_CHECK_HEADER(bzlib.h,, BZIP2=no)
+ if test "$BZIP2" != "no"; then
+ AC_CHECK_LIB(bz2, main, CPPFLAGS="$CPPFLAGS -DUSE_BZ2LIB"
LDFLAGS="$LDFLAGS -lbz2", BZIP2=no)
+ fi
+ if test "$BZIP2" = "no"; then
+ AC_MSG_ERROR(libbzip2 headers and/or libraries could not be
found)
+ fi
+fi
+
+dnl --- VORBIS -----------------
+AC_ARG_WITH(vorbis,
+ [ --with-vorbis [Use vorbis (default: autodetect)]])
+if test "$with_vorbis" != "no"; then
+ AC_CHECK_HEADER(ogg/ogg.h,, VORBIS=no)
+ AC_CHECK_HEADER(vorbis/codec.h,, VORBIS=no)
+ if test "$VORBIS" != "no"; then
+ AC_CHECK_LIB(vorbis, vorbis_info_init, CPPFLAGS="$CPPFLAGS
-DUSE_VORBIS" LDFLAGS="$LDFLAGS -lvorbis -logg", VORBIS=no, -logg)
+ fi
+ if test "x$with_vorbis" != "x" -a "$VORBIS" = "no"; then
+ AC_MSG_ERROR(vorbis headers and/or libraries could not be
found)
+ fi
+else
+ VORBIS=no
+fi
+
+dnl --- THEORA -----------------
+AC_ARG_WITH(theora,
+ [ --with-theora [Use theora (default: no)]])
+if test "$with_theora" != "no" -a "x$with_theora" != "x"; then
+ if test "$VORBIS" = "no"; then
+ AC_MSG_ERROR(vorbis is required for theora support)
+ fi
+ AC_CHECK_HEADER(ogg/ogg.h,, THEORA=no)
+ AC_CHECK_HEADER(theora/theora.h,, THEORA=no)
+ if test "$THEORA" != "no"; then
+ AC_CHECK_LIB(theora, theora_decode_init, CPPFLAGS="$CPPFLAGS
-DUSE_THEORA" LDFLAGS="$LDFLAGS -ltheora -logg", THEORA=no, -logg)
+ fi
+ if test "x$with_theora" != "x" -a "$THEORA" = "no"; then
+ AC_MSG_ERROR(theora headers and/or libraries could not be
found)
+ fi
+fi
+
+dnl --- MIKMOD -----------------
+AC_ARG_WITH(mikmod,
+ [ --with-mikmod [Use mikmod (default: autodetect)]])
+if test "$with_mikmod" != "no"; then
+ AC_CHECK_HEADER(mikmod.h,, MIKMOD=no)
+ if test "$MIKMOD" != "no"; then
+ AC_CHECK_LIB(mikmod, MikMod_Init, CPPFLAGS="$CPPFLAGS
-DUSE_MIKMOD" LDFLAGS="$LDFLAGS -lmikmod", MIKMOD=no)
+ fi
+ if test "x$with_mikmod" != "x" -a "$MIKMOD" = "no"; then
+ AC_MSG_ERROR(mikmod headers and/or libraries could not be
found)
+ fi
+fi
+
+dnl --- MNG --------------------
+AC_ARG_WITH(mng,
+ [ --with-mng [Use mng (default: no)]])
+if test "$with_mng" != "no" -a "x$with_mng" != "x"; then
+ AC_CHECK_HEADER(libmng.h,, MNG=no)
+ if test "$MNG" != "no"; then
+ AC_CHECK_LIB(mng, main, CPPFLAGS="$CPPFLAGS -DUSE_MNG"
LDFLAGS="$LDFLAGS -lmng", MNG=no)
+ fi
+ if test "$MNG" = "no"; then
+ AC_MSG_ERROR(mng headers and/or libraries could not be found)
+ fi
+fi
+
+dnl --- LUA --------------------
+if test "$ARCH" = "linux"; then
+ LDFLAGS="$LDFLAGS -ldl"
+fi
+AC_CHECK_HEADER(lua.h,, AC_MSG_ERROR(could not find lua.h))
+AC_SEARCH_LIBS(lua_getfenv, lua lua50 lua5.0, LDFLAGS="$LDFLAGS $LIBS",
AC_MSG_ERROR(Lua5 is required))
+AC_SEARCH_LIBS(luaopen_base, lualib lualib50 lualib5.0, LDFLAGS="$LDFLAGS
$LIBS", AC_MSG_ERROR(Lualib5 is required))
+
+dnl --- SDL --------------------
+AC_CHECK_PROGS(SDLCONFIG, sdl-config)
+if test "x$SDLCONFIG" = "x"; then
+ AC_CHECK_PROGS(SDLCONFIG, sdl11-config)
+fi
+if test "x$SDLCONFIG" = "x"; then
+ echo "*** sdl-config not found";
+ exit 1;
+fi
+
+CPPFLAGS="$CPPFLAGS `$SDLCONFIG --cflags`"
+if test "$enable_static" != "yes"; then
+ LDFLAGS="$LDFLAGS `$SDLCONFIG --libs`"
+else
+ LDFLAGS="$LDFLAGS `$SDLCONFIG --static-libs`"
+fi
+
+
+
+if test "$prefix" = "NONE"; then
+ PREFIX=/usr/local
+else
+ PREFIX="$prefix"
+fi
+AC_SUBST(PREFIX)
+
+if test "$ARCH" = "win32"; then
+ if test "`uname -a | grep -is cygwin`"; then
+ LDFLAGS="$LDFLAGS -lwsock32 -lws2_32"
+ else
+ LDFLAGS="$LDFLAGS -lwsock32 -lws2_32 -lmingwex -lgmon"
+ fi
+fi
+
+AC_SUBST(CPPFLAGS)
+AC_SUBST(CXXFLAGS)
+AC_SUBST(LDFLAGS)
+
+if test "$ARCH" = "win32"; then
+ if ! test -f Rules.make; then
+ echo "include Rules.make.WIN32" >Rules.make
+ fi
+ AC_CONFIG_FILES(Rules.make.WIN32:Rules.make.in)
+else
+ AC_CONFIG_FILES(Rules.make)
+fi
+AC_OUTPUT
+
+# EOF #
diff --git a/games-engines/stratagus/widgets.h.patch
b/games-engines/stratagus/widgets.h.patch
new file mode 100644
index 0000000..d0a9d35
--- /dev/null
+++ b/games-engines/stratagus/widgets.h.patch
@@ -0,0 +1,19 @@
+--- src/include/widgets.h.orig 2006-12-10 23:33:04.000000000 +0100
++++ src/include/widgets.h 2006-12-10 23:33:19.000000000 +0100
+@@ -10,7 +10,7 @@
+ //
+ /**@name widgets.h - The widgets headerfile. */
+ //
+-// (c) Copyright 2005-2006 by Fran?ois Beerten and Jimmy Salmon
++// (c) Copyright 2005-2006 by Fran?ois Beerten and Jimmy Salmon
+ //
+ // This program is free software; you can redistribute it and/or modify
+ // it under the terms of the GNU General Public License as published by
+@@ -34,7 +34,6 @@
+ #include <guichan.h>
+ #include <guichan/gsdl.h>
+ #ifdef USE_OPENGL
+-#include <guichan/opengl.h>
+ #endif
+ typedef int lua_Object; // from tolua++.h
+
diff --git a/games-strategy-rts/bos/BUILD b/games-strategy-rts/bos/BUILD
index f2466dd..27ba77d 100755
--- a/games-strategy-rts/bos/BUILD
+++ b/games-strategy-rts/bos/BUILD
@@ -1 +1 @@
-echo "Emtpy"
+true
diff --git a/games-strategy-rts/bos/DETAILS b/games-strategy-rts/bos/DETAILS
index c166aa2..1b62ec7 100755
--- a/games-strategy-rts/bos/DETAILS
+++ b/games-strategy-rts/bos/DETAILS
@@ -1,15 +1,14 @@
SPELL=bos
- VERSION=1.1
- SOURCE=${SPELL}_1_1.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}_1_1
- SOURCE_URL[0]=http://bos.seul.org/files/bos_1_1.tar.gz
+ VERSION=2.0
+ SOURCE=${SPELL}_${VERSION/./_}.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/data.bos
+ SOURCE_URL[0]=http://bos.seul.org/files/$SOURCE
WEB_SITE=http://bos.seul.org
ENTERED=20040719
- UPDATED=20040719
-
SOURCE_HASH=sha512:b8d31779866c709d72c6e357738bdac7f79ff638aca28c6eca6f5b66ba0fe93159c25f2e7809234fe477ea015a7151b8977ae58a57291e36d560fd321b8712b9
+
SOURCE_HASH=sha512:076b3c4493c5261e5fe5616e1d1bdd7db28784562d85d9806223a2a130773cd2e98a663c5c9b79520d5fbe827066b92cd5e1c2fc4af913ec7a17373206921927
LICENSE[0]=GPL
SHORT='A game for the stratagus engine'
cat << EOF
Invasion - Battle of Survival is a real-time strategy game using the
Stratagus
-game engine.
+game engine.
EOF
diff --git a/games-strategy-rts/bos/HISTORY b/games-strategy-rts/bos/HISTORY
index f90c655..1c9b5f9 100644
--- a/games-strategy-rts/bos/HISTORY
+++ b/games-strategy-rts/bos/HISTORY
@@ -1,3 +1,8 @@
+2006-12-11 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: version update
+ * INSTALL: minor fixup
+ * BUILD: minor fixup
+
2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-strategy-rts/bos/INSTALL b/games-strategy-rts/bos/INSTALL
index 1b62888..1a0ac93 100755
--- a/games-strategy-rts/bos/INSTALL
+++ b/games-strategy-rts/bos/INSTALL
@@ -1,5 +1,5 @@
cd ${SOURCE_DIRECTORY}
install -pv $SCRIPT_DIRECTORY/bos ${INSTALL_ROOT}/usr/games
mkdir -pv ${INSTALL_ROOT}/usr/share/games/stratagus/bos
-cp -rfv data ${INSTALL_ROOT}/usr/share/games/stratagus/bos/
+cp -rfv * ${INSTALL_ROOT}/usr/share/games/stratagus/bos/




  • [SM-Commit] GIT changes to master games grimoire by Andra?? Levstik (59d268349e595752f70c3f4bace83249f8775efc), Andra?? Levstik, 12/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page