Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (ddb95f2d8400fc18950211d7cb1d8a9a368ae7fa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (ddb95f2d8400fc18950211d7cb1d8a9a368ae7fa)
  • Date: Fri, 13 Apr 2007 18:19:21 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null
|binary
games-fps/sauerbraten/20050815-addfullpath-rendergl.cpp.patch
| 12 --
games-fps/sauerbraten/20050815-addfullpath-tools.cpp.patch
| 33 -------
games-fps/sauerbraten/20050815-addfullpath-tools.h.patch
| 11 --
games-fps/sauerbraten/BUILD
| 4
games-fps/sauerbraten/DETAILS
| 7 -
games-fps/sauerbraten/HISTORY
| 20 ++++
games-fps/sauerbraten/INSTALL
| 42 ++++++----
games-fps/sauerbraten/PRE_BUILD
| 34 +-------
games-fps/sauerbraten/sauerbraten_2005_08_15_quakecon_edition.zip.sig
| 0

games-fps/sauerbraten/sauerbraten_2007_04_13_spring_edition_linux.tar.bz2.sig
|binary
games-fps/sauerbraten/sauerbraten_client
| 11 ++
games-fps/sauerbraten/sauerbraten_server
| 11 ++
13 files changed, 78 insertions(+), 107 deletions(-)

New commits:
commit ddb95f2d8400fc18950211d7cb1d8a9a368ae7fa
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

sauerbraten: Updated to 2007_04_13_spring_edition

diff --git a/games-fps/sauerbraten/20050815-addfullpath-rendergl.cpp.patch
b/games-fps/sauerbraten/20050815-addfullpath-rendergl.cpp.patch
deleted file mode 100644
index c3a422f..0000000
--- a/games-fps/sauerbraten/20050815-addfullpath-rendergl.cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sauerbraten.orig/src/engine/rendergl.cpp
sauerbraten/src/engine/rendergl.cpp
---- sauerbraten.orig/src/engine/rendergl.cpp 2005-10-03 21:51:10.000000000
-0700
-+++ sauerbraten/src/engine/rendergl.cpp 2005-10-03 21:56:48.000000000
-0700
-@@ -116,6 +116,8 @@
-
- Texture *textureload(char *name, int rot, bool clamp, bool mipit, bool msg)
- {
-+ name = addfullpath ( name );
-+
- string rname, tname;
- strcpy_s(tname, name);
- strcpy_s(rname, path(tname));
diff --git a/games-fps/sauerbraten/20050815-addfullpath-tools.cpp.patch
b/games-fps/sauerbraten/20050815-addfullpath-tools.cpp.patch
deleted file mode 100644
index 3f8c171..0000000
--- a/games-fps/sauerbraten/20050815-addfullpath-tools.cpp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur sauerbraten.orig/src/shared/tools.cpp
sauerbraten/src/shared/tools.cpp
---- sauerbraten.orig/src/shared/tools.cpp 2005-10-03 20:21:00.000000000
-0700
-+++ sauerbraten/src/shared/tools.cpp 2005-10-03 20:23:36.000000000 -0700
-@@ -5,8 +5,24 @@
-
- ///////////////////////// misc tools ///////////////////////
-
-+// Modified from http://bugs.gentoo.org/show_bug.cgi?id=104292
-+char *addfullpath ( char *s )
-+{
-+ static char ret[256]; // choose a reasonable max buffer size
-+ if (s[0] == '/')
-+ {
-+ return s;
-+ }
-+ int slen = strlen(s);
-+ memset(ret, 0x00, 256);
-+ memcpy(ret, GAMES_DATADIR, GAMES_DATADIR_LEN);
-+ memcpy(ret+GAMES_DATADIR_LEN, s, slen);
-+ return ret;
-+};
-+
- char *path(char *s)
- {
-+ s = addfullpath ( s );
- for(char *t = s; t = strpbrk(t, "/\\"); *t++ = PATHDIV);
- return s;
- };
-@@ -91,3 +107,4 @@
- y ^= (y << 15) & 0xEFC60000U;
- return(y ^ (y >> 18));
- };
-+
diff --git a/games-fps/sauerbraten/20050815-addfullpath-tools.h.patch
b/games-fps/sauerbraten/20050815-addfullpath-tools.h.patch
deleted file mode 100644
index 8ea8a05..0000000
--- a/games-fps/sauerbraten/20050815-addfullpath-tools.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur sauerbraten.orig/src/shared/tools.h sauerbraten/src/shared/tools.h
---- sauerbraten.orig/src/shared/tools.h 2005-10-03 21:42:47.000000000
-0700
-+++ sauerbraten/src/shared/tools.h 2005-10-03 21:46:41.000000000 -0700
-@@ -115,6 +115,7 @@
- #endif
-
-
-+extern char *addfullpath ( char* s );
- extern char *path(char *s);
- extern char *loadfile(char *fn, int *size);
- extern void endianswap(void *, int, int);
diff --git a/games-fps/sauerbraten/BUILD b/games-fps/sauerbraten/BUILD
index bd452d6..67d116b 100755
--- a/games-fps/sauerbraten/BUILD
+++ b/games-fps/sauerbraten/BUILD
@@ -1,4 +1,4 @@
-cd enet &&
+cd src/enet &&
default_games_build &&
-cd ../src &&
+cd .. &&
make
diff --git a/games-fps/sauerbraten/DETAILS b/games-fps/sauerbraten/DETAILS
index 400c4f9..da15314 100755
--- a/games-fps/sauerbraten/DETAILS
+++ b/games-fps/sauerbraten/DETAILS
@@ -1,13 +1,12 @@
SPELL=sauerbraten
- VERSION=2005_08_15
- SOURCE=${SPELL}_${VERSION}_quakecon_edition.zip
+ VERSION=2007_04_13_spring_edition
+ SOURCE=${SPELL}_${VERSION}_linux.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ LICENSE[0]=ZLIB
WEB_SITE=http://strlen.com/sauerbraten/
ENTERED=20051003
- UPDATED=20051003
- LICENSE[0]=ZLIB
SHORT='Next generation Cube FPS'
cat << EOF
Experimental engine based on Cube, can be seen as "Next-Gen Cube", or "Cube
2".
diff --git a/games-fps/sauerbraten/HISTORY b/games-fps/sauerbraten/HISTORY
index 9c4f5ca..1fde148 100644
--- a/games-fps/sauerbraten/HISTORY
+++ b/games-fps/sauerbraten/HISTORY
@@ -1,3 +1,23 @@
+2007-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2007_04_13_spring_edition
+ SOURCE changed to _linux.tar.bz2
+ Removed UPDATED
+ * PRE_BUILD: enet/configure is already +x
+ Do not pushd to SOURCE_DIRECTORY when we never use popd
+ Remove full path hackery
+ * BUILD: enet is now under the src directory
+ * INSTALL: Binaries are no longer stored under a sauerbraten subdir
+ Change back to SOURCE_DIRECTORY before copying files
+ Change permissions on files *before* copying, don't glob chown
+ installed locations (we don't want to take ownership of mods ;))
+ Install custom builds to /usr/share/games/sauerbraten/bin as well
+ Install custom run scripts for custom builds
+ CUBE_TODO.txt -> OCTA_TODO.txt
+ * sauerbraten_{client,server}: Added custom run scripts
+ * 20050815-addfullpath-rendergl.cpp.patch,
+ 20050815-addfullpath-tools.cpp.patch,
+ 20050815-addfullpath-tools.h.patch: No longer needed
+
2006-08-29 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* INSTALL: removed I_DIR
* PRE_BUILD: removed I_DIR
diff --git a/games-fps/sauerbraten/INSTALL b/games-fps/sauerbraten/INSTALL
index f3d32c4..edfa036 100755
--- a/games-fps/sauerbraten/INSTALL
+++ b/games-fps/sauerbraten/INSTALL
@@ -1,21 +1,31 @@
-install -v -o root -g games -m 750 $SOURCE_DIRECTORY/src/sauer_client
\
- $INSTALL_ROOT/usr/games/sauerbraten_client
&&
-install -v -o root -g games -m 750 $SOURCE_DIRECTORY/src/sauer_server
\
- $INSTALL_ROOT/usr/games/sauerbraten_server
&&
+cd $SOURCE_DIRECTORY &&
+mkdir -vp $INSTALL_ROOT/usr/share/games/$SPELL/bin &&
+
+install -v -o root -g games -m 750 src/sauer_client \
+ $INSTALL_ROOT/usr/share/games/$SPELL/bin/sauerbraten_client &&
+install -v -o root -g games -m 750 src/sauer_server \
+ $INSTALL_ROOT/usr/share/games/$SPELL/bin/sauerbraten_server &&
+
+install -v -o root -g games -m 750 $SCRIPT_DIRECTORY/${SPELL}_client \
+ $INSTALL_ROOT/usr/games &&
+install -v -o root -g games -m 750 $SCRIPT_DIRECTORY/${SPELL}_server \
+ $INSTALL_ROOT/usr/games &&

-cd $SOURCE_DIRECTORY/$SPELL
&&
if [ "$SAUERBRATEN_BINARY" == "y" ]; then
- mkdir -vp $INSTALL_ROOT/usr/share/games/sauerbraten/bin
&&
- install -v -o root -g games -m 750 $SCRIPT_DIRECTORY/$SPELL_*_bin
\
+ install -v -o root -g games -m 750 $SCRIPT_DIRECTORY/${SPELL}_*_bin
\
$INSTALL_ROOT/usr/games
&&
install -v -o root -g games -m 750 bin_unix/linux_client
\
- $INSTALL_ROOT/usr/share/games/sauerbraten/bin/bin/sauerbraten_client_bin
&&
+ $INSTALL_ROOT/usr/share/games/$SPELL/bin/sauerbraten_client_bin
&&
install -v -o root -g games -m 750 bin_unix/linux_server
\
- $INSTALL_ROOT/usr/share/games/sauerbraten/bin/bin/sauerbraten_server_bin
-fi
&&
-cp -r *.cfg data packages $INSTALL_ROOT/usr/share/games/sauerbraten/
&&
-chown -vR root:games $INSTALL_ROOT/usr/share/games/sauerbraten/
&&
-mv bin_unix/readme.txt bin_unix/readme.bin.txt
&&
-install -v -o root -g games -d -m 640 /usr/share/doc/sauerbraten
&&
-install -v -o root -g games bin_unix/readme.bin.txt ../readme_*.txt
\
- ../src/CUBE_TODO.txt /usr/share/doc/sauerbraten
+ $INSTALL_ROOT/usr/share/games/$SPELL/bin/sauerbraten_server_bin
+fi &&
+
+chown -R root:games . &&
+cp -r data packages $INSTALL_ROOT/usr/share/games/$SPELL/ &&
+
+mv bin_unix/readme.txt bin_unix/readme.bin.txt &&
+install -v -o root -g games -d -m 640 /usr/share/doc/$SPELL &&
+install -v -o root -g games bin_unix/readme.bin.txt \
+ README.html \
+ src/OCTA_TODO.txt \
+ /usr/share/doc/$SPELL
diff --git a/games-fps/sauerbraten/PRE_BUILD b/games-fps/sauerbraten/PRE_BUILD
index 638ca4d..be0a800 100755
--- a/games-fps/sauerbraten/PRE_BUILD
+++ b/games-fps/sauerbraten/PRE_BUILD
@@ -1,35 +1,11 @@
-default_pre_build &&
-chmod a+x $SOURCE_DIRECTORY/enet/configure &&
-pushd $SOURCE_DIRECTORY/src &&
-sedit 's:-lGL -lGLU:-L/usr/X11R6/lib &:' Makefile &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src &&
+sedit 's:-lGL -lGLU:-L/usr/X11R6/lib &:' Makefile &&

#
-# Enable our custom optimizations for Cube
+# Enable our custom optimizations for Sauerbraten
#
-sedit "s:-O3 -fsigned-char -fomit-frame-pointer:$CXXFLAGS:" \
- Makefile &&
-
-#
-# Modified Gentoo patches from Cube
-# Original sources from http://bugs.gentoo.org/show_bug.cgi?id=104292
-#
-patch shared/tools.h \
- $SCRIPT_DIRECTORY/20050815-addfullpath-tools.h.patch &&
-patch shared/tools.cpp \
- $SCRIPT_DIRECTORY/20050815-addfullpath-tools.cpp.patch &&
-patch engine/rendergl.cpp \
- $SCRIPT_DIRECTORY/20050815-addfullpath-rendergl.cpp.patch &&
-local GAME_DIR_LEN=28 &&
-let GAME_DIR_LEN=$GAME_DIR_LEN+${#INSTALL_ROOT} &&
-#
-# Add GAMES_DATADIR/GAMES_DATADIR_LEN for the above patch
-# Original sources from http://bugs.gentoo.org/show_bug.cgi?id=104292
-#
-sedit "5a\
-#define GAMES_DATADIR \"$INSTALL_DIR/usr/share/games/sauerbraten\"" \
- shared/tools.h &&
-sedit "6a\
-#define GAMES_DATADIR_LEN ${GAME_DIR_LEN}" shared/tools.h &&
+sedit "s:-O3 -fomit-frame-pointer:$CXXFLAGS:" Makefile &&

# Gentoo fix for parallel make
sedit 's/make -C/$(MAKE) -C/' Makefile
diff --git
a/games-fps/sauerbraten/sauerbraten_2005_08_15_quakecon_edition.zip.sig
b/games-fps/sauerbraten/sauerbraten_2005_08_15_quakecon_edition.zip.sig
deleted file mode 100644
index 98c1688..0000000
Binary files
a/games-fps/sauerbraten/sauerbraten_2005_08_15_quakecon_edition.zip.sig and
/dev/null differ
diff --git
a/games-fps/sauerbraten/sauerbraten_2007_04_13_spring_edition_linux.tar.bz2.sig

b/games-fps/sauerbraten/sauerbraten_2007_04_13_spring_edition_linux.tar.bz2.sig
new file mode 100644
index 0000000..08dcc91
Binary files /dev/null and
b/games-fps/sauerbraten/sauerbraten_2007_04_13_spring_edition_linux.tar.bz2.sig
differ
diff --git a/games-fps/sauerbraten/sauerbraten_client
b/games-fps/sauerbraten/sauerbraten_client
new file mode 100644
index 0000000..5fbe5d4
--- /dev/null
+++ b/games-fps/sauerbraten/sauerbraten_client
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Sauerbraten client binary loader
+#
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
+# Copyright (C) Source mage GNU/Linux 2005
+# Licensed under the GPL
+#
+
+cd /usr/share/games/sauerbraten &&
+./bin/sauerbraten_client $*
diff --git a/games-fps/sauerbraten/sauerbraten_server
b/games-fps/sauerbraten/sauerbraten_server
new file mode 100644
index 0000000..a200d6b
--- /dev/null
+++ b/games-fps/sauerbraten/sauerbraten_server
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Sauerbraten server binary loader
+#
+# Written for Source Mage GNU/Linux by Eric Sandall <sandalle AT sourcemage.org>
+# Copyright (C) Source mage GNU/Linux 2005
+# Licensed under the GPL
+#
+
+cd /usr/share/games/sauerbraten &&
+./bin/sauerbraten_server $*



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (ddb95f2d8400fc18950211d7cb1d8a9a368ae7fa), Eric Sandall, 04/13/2007

Archive powered by MHonArc 2.6.24.

Top of Page