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 (d3548e692ea07100cdd2b3fcb177c9e4d1c9e319)

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 (d3548e692ea07100cdd2b3fcb177c9e4d1c9e319)
Date: Sun, 29 Jan 2012 06:52:57 -0600

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

games-engines/stratagus/BUILD | 2
games-engines/stratagus/DEPENDS | 52
++++++++++------------
games-engines/stratagus/DETAILS | 10 ++--
games-engines/stratagus/HISTORY | 6 ++
games-engines/stratagus/PRE_BUILD | 3 -
games-engines/stratagus/stratagus-2.2.4-fhs.patch | 17 -------
6 files changed, 37 insertions(+), 53 deletions(-)

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

games-engines/stratagus: version 2.2.6

diff --git a/games-engines/stratagus/BUILD b/games-engines/stratagus/BUILD
index 0221101..2663f04 100755
--- a/games-engines/stratagus/BUILD
+++ b/games-engines/stratagus/BUILD
@@ -1,3 +1,3 @@
make_single &&
-default_games_build &&
+cmake_build &&
make_normal
diff --git a/games-engines/stratagus/DEPENDS b/games-engines/stratagus/DEPENDS
index ea4a3d2..7496b2a 100755
--- a/games-engines/stratagus/DEPENDS
+++ b/games-engines/stratagus/DEPENDS
@@ -1,39 +1,37 @@
-depends lua &&
+depends OPENGL &&
+depends libice &&
depends libpng &&
+depends libsm &&
+depends libx11 &&
+depends libxext &&
+depends lua51 &&
depends sdl &&
+depends sqlite &&
+depends tolua++ &&
depends zlib &&
+depends -sub CXX gcc &&

-optional_depends OPENGL \
- "--with-opengl" \
- "--without-opengl" \
- "for OpenGL support$advisable$" &&
+optional_depends libvorbis \
+ "-DWITH_OGGVORBIS=ON" \
+ "-DWITH_OGGVORBIS=OFF" \
+ "for vorbis support$recommended$" &&

-optional_depends libogg \
- "--with-ogg" \
- "--without-ogg" \
- "for ogg support$recommended$" &&
-
-optional_depends libvorbis \
- "--with-ogg" \
- "--without-ogg" \
- "for vorbiss support$recommended$" &&
+optional_depends libtheora \
+ "-DWITH_THEORA=ON" \
+ "-DWITH_THEORA=OFF" \
+ "for theora support$recommended$" &&

optional_depends libmikmod \
- "--with-mikmod" \
- "--without-mikmod" \
+ "-DWITH_MIKMOD=ON" \
+ "-DWITH_MIKMOD=OFF" \
"for mikmod support$recommended$" &&

optional_depends bzip2 \
- "--with-bzip2" \
- "--without-bzip2" \
+ "-DWITH_BZIP2=ON" \
+ "-DWITH_BZIP2=OFF" \
"for bzip2 support" &&

-optional_depends flac \
- "--with-flac" \
- "--without-flac" \
- "for flac support$not sure if this works$" &&
-
-optional_depends libmad \
- "--with-mad" \
- "--without-mad" \
- "for mad support"
+optional_depends libmng \
+ "-DWITH_MNG=ON" \
+ "-DWITH_MNG=OFF" \
+ "for mng support"
diff --git a/games-engines/stratagus/DETAILS b/games-engines/stratagus/DETAILS
index db785c9..e34509b 100755
--- a/games-engines/stratagus/DETAILS
+++ b/games-engines/stratagus/DETAILS
@@ -1,11 +1,11 @@
SPELL=stratagus
- VERSION=2.2.4
- SOURCE=$SPELL-$VERSION-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/stratagus/$SOURCE
+ VERSION=2.2.6
+ SOURCE=stratagus_${VERSION}.orig.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL}_${VERSION}.orig"
+
SOURCE_URL[0]=http://launchpad.net/stratagus/trunk/${VERSION}/+download/${SOURCE}
WEB_SITE=http://stratagus.sf.net
ENTERED=20040718
-

SOURCE_HASH=sha512:350be97629ac2a6c731a07babd27c27b3e0efe8bfe9d8636db4963a38eca175b80b43efe82a223dae8e3f2a5f9d4772dfffcd132a66ad9f51f93b13b94137f31
+
SOURCE_HASH=sha512:c4c1be1b45aeba113797e8b53cd864016d33cac83a6fe2aa7235dd451de1290c03e3f7915cff2fbc78312ac7c3079c8fc02c3619a49f6fd05e6177df15386be0
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 76c2890..8f57ed2 100644
--- a/games-engines/stratagus/HISTORY
+++ b/games-engines/stratagus/HISTORY
@@ -1,3 +1,9 @@
+2012-01-29 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.2.6
+ * BUILD: switched to cmake
+ * DEPENDS: corrected dependencies, switched to cmake
+ * PRE_BUILD, stratagus-2.2.4-fhs.patch: removed
+
2008-02-14 Dale E. Edmons <linuxfan AT sourcemage.org>
* stratagus-2.2.4-lhs.patch: renamed
* stratagus-2.2.4-fhs.patch: new name
diff --git a/games-engines/stratagus/PRE_BUILD
b/games-engines/stratagus/PRE_BUILD
deleted file mode 100755
index badf10a..0000000
--- a/games-engines/stratagus/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SCRIPT_DIRECTORY/$SPELL-$VERSION-fhs.patch
diff --git a/games-engines/stratagus/stratagus-2.2.4-fhs.patch
b/games-engines/stratagus/stratagus-2.2.4-fhs.patch
deleted file mode 100644
index b130ab4..0000000
--- a/games-engines/stratagus/stratagus-2.2.4-fhs.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uraN stratagus-2.2.4/Makefile b/Makefile
---- stratagus-2.2.4/Makefile 2007-03-04 14:12:34.000000000 -0800
-+++ b/Makefile 2008-02-14 05:41:05.000000000 -0800
-@@ -310,11 +310,11 @@
- install: all install-stratagus
-
- install-stratagus:
-- install -m 755 stratagus $(PREFIX)/bin
-+ install -m 755 stratagus $(PREFIX)/games
- @echo installation of stratagus complete
-
- uninstall:
- @echo uninstalling stratagus and stratagus tools
-- rm $(PREFIX)/bin/stratagus
-+ rm $(PREFIX)/games/stratagus
- @echo uninstallation of stratagus complete
-

[SM-Commit] GIT changes to master games grimoire by Florian Franzmann (d3548e692ea07100cdd2b3fcb177c9e4d1c9e319), Florian Franzmann, 01/29/2012