sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master games grimoire by Andraž Levstik (b48d85c42df489fb86b038de4df91fe15e36c94d)

From: Andraž Levstik <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master games grimoire by Andraž Levstik (b48d85c42df489fb86b038de4df91fe15e36c94d)
Date: Tue, 4 Sep 2007 02:51:27 -0500

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

games-arcade-3d/xwelltris/BUILD | 1
games-arcade-3d/xwelltris/HISTORY | 6 +++
games-arcade-3d/xwelltris/INSTALL | 6 +++
games-arcade-3d/xwelltris/PRE_BUILD | 18 +++++++++++
games-arcade-3d/xwelltris/check_abs_paths.diff | 14 ++++++++
games-fps/bzflag/CONFIGURE | 31 ++++++++++---------
games-fps/bzflag/HISTORY | 5 +++
games-fps/bzflag/PRE_BUILD | 3 +
games-fps/bzflag/bzadmin_stdboth_colors.patch | 39
+++++++++++++++++++++++++
9 files changed, 109 insertions(+), 14 deletions(-)

New commits:
commit b48d85c42df489fb86b038de4df91fe15e36c94d
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

xwelltris: fixes for bug 13974 and other fixups

commit ee5c92fbe8225f58b5750c9c1b2fb61862aa752c
Author: root <root@omega.(none)>
Commit: root <root@omega.(none)>

bzflag: forgot a path to the patch

commit 05ad2f5d38b1cb0c5aaf909d57c3fa33fe7c4f55
Author: root <root@omega.(none)>
Commit: root <root@omega.(none)>

bzflag: added a patch

diff --git a/games-arcade-3d/xwelltris/BUILD b/games-arcade-3d/xwelltris/BUILD
new file mode 100755
index 0000000..f2438e5
--- /dev/null
+++ b/games-arcade-3d/xwelltris/BUILD
@@ -0,0 +1 @@
+default_games_build
diff --git a/games-arcade-3d/xwelltris/HISTORY
b/games-arcade-3d/xwelltris/HISTORY
index 1522f86..e3ebef8 100644
--- a/games-arcade-3d/xwelltris/HISTORY
+++ b/games-arcade-3d/xwelltris/HISTORY
@@ -1,3 +1,9 @@
+2007-09-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * BUILD: added to install binary to /usr/games
+ * INSTALL: added to set perms
+ * PRE_BUILD: added to fix a lot of stuff
+ * check_abs_paths.diff: added to fix score looking in /var/games
+
2006-09-21 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-arcade-3d/xwelltris/INSTALL
b/games-arcade-3d/xwelltris/INSTALL
new file mode 100755
index 0000000..d0cd51e
--- /dev/null
+++ b/games-arcade-3d/xwelltris/INSTALL
@@ -0,0 +1,6 @@
+mkdir -vp $INSTALL_ROOT/var/games/xwelltris &&
+default_install &&
+cd $INSTALL_ROOT/var/games/xwelltris &&
+find_and_scam &&
+cd $INSTALL_ROOT/usr/share/games/xwelltris &&
+find_and_scam
diff --git a/games-arcade-3d/xwelltris/PRE_BUILD
b/games-arcade-3d/xwelltris/PRE_BUILD
new file mode 100755
index 0000000..40887ff
--- /dev/null
+++ b/games-arcade-3d/xwelltris/PRE_BUILD
@@ -0,0 +1,18 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's:INSTDIR=.*:INSTDIR=@bindir@:g' src/Make.common.in &&
+sedit "s:\$(INSTALL_SHARE_DATA) \$(SHARE_DATAFILES) \$(INSTLIB):\$(INSTALL)
-m 0660 \$(SHARE_DATAFILES) $INSTALL_ROOT/var/games/xwelltris/:" \
+ Makefile.in &&
+sedit 's:INSTLIB=.*:INSTLIB=@datadir@/xwelltris:g' \
+ src/Make.common.in &&
+sedit 's#Install path:.*#Install path: $bindir#' \
+ configure.in &&
+sedit 's:GLOBAL_SEARCH.*:GLOBAL_SEARCH \"@datadir@/xwelltris\":' \
+ src/include/globals.h.in &&
+sedit "84i#define GLOBAL_SCORE \"$INSTALL_ROOT/var/games/xwelltris\"" \
+ src/include/globals.h.in &&
+sedit "84i#define GLOBAL_SCORE \"$INSTALL_ROOT/var/games/xwelltris\"" \
+ src/include/globals.h &&
+patch -p0 < $SPELL_DIRECTORY/check_abs_paths.diff &&
+autoreconf
+
diff --git a/games-arcade-3d/xwelltris/check_abs_paths.diff
b/games-arcade-3d/xwelltris/check_abs_paths.diff
new file mode 100644
index 0000000..8b9b249
--- /dev/null
+++ b/games-arcade-3d/xwelltris/check_abs_paths.diff
@@ -0,0 +1,14 @@
+--- src/commonfuncs.cxx.orig 2003-02-27 09:27:51.000000000 +0100
++++ src/commonfuncs.cxx 2007-09-04 09:37:22.000000000 +0200
+@@ -41,6 +41,11 @@
+
+ do
+ {
++ sprintf(ret_full_pathname,"%s/%s",GLOBAL_SCORE,name); //First check in
GLOBAL_SCORE dir
++ fd=open(ret_full_pathname,fmode);
++ if(fd>0)
++ break;
++
+ sprintf(ret_full_pathname,"%s/%s",GLOBAL_SEARCH,name); //First check in
GLOBAL_SEARCH dir
+ fd=open(ret_full_pathname,fmode);
+ if(fd>0)
diff --git a/games-fps/bzflag/CONFIGURE b/games-fps/bzflag/CONFIGURE
index ea45fcb..8afcebb 100755
--- a/games-fps/bzflag/CONFIGURE
+++ b/games-fps/bzflag/CONFIGURE
@@ -1,16 +1,19 @@
#THREADS are NON-SAFE and can break stuff
-config_query_option BZF_OPTS \
- "Build game client?" \
- y \
- "--enable-client" \
- "--disable-client" &&
-config_query_option BZF_OPTS \
- "Build robots?" \
- y \
- "--enable-robots" \
- "--disable-robots" &&
-config_query_option BZF_OPTS \
- "Enable screenshots?" \
- y \
- "--enable-snapping" \
+config_query BZF_BZADMIN_PATCH \
+ "Do you want bzadmin stdboth colors patch?" \
+ n &&
+config_query_option BZF_OPTS \
+ "Build game client?" \
+ y \
+ "--enable-client" \
+ "--disable-client" &&
+config_query_option BZF_OPTS \
+ "Build robots?" \
+ y \
+ "--enable-robots" \
+ "--disable-robots" &&
+config_query_option BZF_OPTS \
+ "Enable screenshots?" \
+ y \
+ "--enable-snapping" \
"--disable-snapping"
diff --git a/games-fps/bzflag/HISTORY b/games-fps/bzflag/HISTORY
index ea976b9..dcba62e 100644
--- a/games-fps/bzflag/HISTORY
+++ b/games-fps/bzflag/HISTORY
@@ -1,3 +1,8 @@
+2007-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * CONFIGURE: added a query for a patch
+ * PRE_BUILD: apply patch, forgot the path to patch
+ * bzadmin_stdboth_colors.patch: added the patch
+
2007-07-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: stray &&

diff --git a/games-fps/bzflag/PRE_BUILD b/games-fps/bzflag/PRE_BUILD
index 3336971..46464f6 100755
--- a/games-fps/bzflag/PRE_BUILD
+++ b/games-fps/bzflag/PRE_BUILD
@@ -6,4 +6,7 @@ patch -p0 < ${SPELL_DIRECTORY}/autogen.sh-automake.patch
fi &&
sedit 's:-O0::g' configure.ac &&
sedit 's:-Werror::g' configure.ac &&
+if [[ $BZF_BZADMIN_PATCH == y ]]; then
+patch -p0 < ${SPELL_DIRECTORY}/bzadmin_stdboth_colors.patch
+fi &&
NOCONFIGURE=X ./autogen.sh
diff --git a/games-fps/bzflag/bzadmin_stdboth_colors.patch
b/games-fps/bzflag/bzadmin_stdboth_colors.patch
new file mode 100644
index 0000000..a09dffc
--- /dev/null
+++ b/games-fps/bzflag/bzadmin_stdboth_colors.patch
@@ -0,0 +1,39 @@
+Index: src/bzadmin/StdBothUI.cxx
+===================================================================
+--- src/bzadmin/StdBothUI.cxx (revision 15558)
++++ src/bzadmin/StdBothUI.cxx (working copy)
+@@ -59,8 +59,32 @@
+ #endif
+ }
+
+-void StdBothUI::outputMessage(const std::string& msg, ColorCode) {
+- std::cout<<msg<<std::endl;
++void StdBothUI::outputMessage(const std::string& msg, ColorCode ColCode) {
++ std::string OutColor;
++ const std::string DefColor = "\033[0m";
++ OutColor = DefColor;
++ if ( ColCode == White ) {
++ OutColor = "\033[37m";
++ }
++ else if ( ColCode == Red ) {
++ OutColor = "\033[31m";
++ }
++ else if ( ColCode == Green ) {
++ OutColor = "\033[32m";
++ }
++ else if ( ColCode == Blue ) {
++ OutColor = "\033[34m";
++ }
++ else if ( ColCode == Purple ) {
++ OutColor = "\033[35m";
++ }
++ else if ( ColCode == Yellow ) {
++ OutColor = "\033[33m";
++ }
++ else if ( ColCode == Cyan ) {
++ OutColor = "\033[36m";
++ }
++ std::cout<<OutColor<<msg<<DefColor<<std::endl;
+ }
+
+

[SM-Commit] GIT changes to master games grimoire by Andraž Levstik (b48d85c42df489fb86b038de4df91fe15e36c94d), Andraž Levstik, 09/04/2007