Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Pol Vinogradov (165c4dcb7b79f9c75a87ae9d53ae2a8fbeb5f476)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Pol Vinogradov (165c4dcb7b79f9c75a87ae9d53ae2a8fbeb5f476)
  • Date: Wed, 3 Jan 2007 20:18:06 -0600

GIT changes to master games grimoire by Pol Vinogradov <vin.public AT gmail.com>:

games-simulation/csmash/BUILD | 6 ++++--
games-simulation/csmash/DETAILS | 1 -
games-simulation/csmash/HISTORY | 7 +++++++
games-simulation/csmash/PRE_BUILD | 6 ++++++
games-simulation/csmash/csmash-gcc41.patch | 22
++++++++++++++++++++++
games-simulation/csmash/csmash-sizeof-cast.patch | 7 +++++++
games-simulation/csmash/csmash-x-inc.patch | 15 +++++++++++++++
7 files changed, 61 insertions(+), 3 deletions(-)

New commits:
commit 165c4dcb7b79f9c75a87ae9d53ae2a8fbeb5f476
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

games-simulation/csmash:

BUILD: added ${OPTS} to ./configure and make
DETAILS: removed UPDATED
PRE_BUILD, csmash-x-inc.patch, csmash-sizeof-cast.patch,
csmash-gcc41.patch: added to fix compile fails (patches are found in
gentoo)

diff --git a/games-simulation/csmash/BUILD b/games-simulation/csmash/BUILD
index 8d84c0d..1d4ff23 100755
--- a/games-simulation/csmash/BUILD
+++ b/games-simulation/csmash/BUILD
@@ -1,2 +1,4 @@
- ./configure --prefix=${INSTALL_ROOT}/usr \
- --bindir=${INSTALL_ROOT}/usr/games
+./configure --prefix=${INSTALL_ROOT}/usr \
+ --bindir=${INSTALL_ROOT}/usr/games \
+ ${OPTS} &&
+make
diff --git a/games-simulation/csmash/DETAILS b/games-simulation/csmash/DETAILS
index 4a70729..2cabbe6 100755
--- a/games-simulation/csmash/DETAILS
+++ b/games-simulation/csmash/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/cannonsmash/$SOURCE
WEB_SITE=http://cannonsmash.sourceforge.net
ENTERED=20010922
- UPDATED=20031124

SOURCE_HASH=sha512:e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916
LICENSE[0]=GPL
SHORT="csmash, Cannon Smash, is a 3D table tennis game."
diff --git a/games-simulation/csmash/HISTORY b/games-simulation/csmash/HISTORY
index b111637..93eed23 100644
--- a/games-simulation/csmash/HISTORY
+++ b/games-simulation/csmash/HISTORY
@@ -1,3 +1,10 @@
+2007-01-04 Pol Vinogradov <vin.public AT gmail.com>
+ * BUILD: added ${OPTS} to ./configure and make
+ * DETAILS: removed UPDATED
+ * PRE_BUILD, csmash-x-inc.patch, csmash-sizeof-cast.patch,
+ csmash-gcc41.patch: added to fix compile fails (patches are found in
+ gentoo)
+
2006-09-21 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/games-simulation/csmash/PRE_BUILD
b/games-simulation/csmash/PRE_BUILD
new file mode 100755
index 0000000..21583d2
--- /dev/null
+++ b/games-simulation/csmash/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+patch -p0 < ${SCRIPT_DIRECTORY}/${SPELL}-x-inc.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/${SPELL}-sizeof-cast.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/${SPELL}-gcc41.patch
diff --git a/games-simulation/csmash/csmash-gcc41.patch
b/games-simulation/csmash/csmash-gcc41.patch
new file mode 100644
index 0000000..0f3e511
--- /dev/null
+++ b/games-simulation/csmash/csmash-gcc41.patch
@@ -0,0 +1,22 @@
+--- BallView.h.old 2006-04-11 00:10:37.000000000 +0200
++++ BallView.h 2006-04-11 00:10:53.000000000 +0200
+@@ -32,7 +32,7 @@
+
+ static GLuint m_number[10];
+ private:
+- void BallView::DrawTargetCircle();
++ void DrawTargetCircle();
+ GLUquadricObj *m_quad;
+
+ void DrawBall();
+--- matrix.old 2006-04-11 00:13:18.000000000 +0200
++++ matrix 2006-04-11 00:19:34.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ /* __BEGIN__BEGIN__ */
+ //__NAMESPACE_BEGIN(ese);
+-#if (!defined __GNUG__) || (__GNUC__ == 3)
++#if (!defined __GNUG__) || (__GNUC__ >= 3)
+ template<typename T>
+ void swap(T& a, T& b)
+ {
diff --git a/games-simulation/csmash/csmash-sizeof-cast.patch
b/games-simulation/csmash/csmash-sizeof-cast.patch
new file mode 100644
index 0000000..5366286
--- /dev/null
+++ b/games-simulation/csmash/csmash-sizeof-cast.patch
@@ -0,0 +1,7 @@
+--- loadparts.cpp
++++ loadparts.cpp
+@@ -247,3 +247,3 @@
+ // concat next line(s)
+- int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++ int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
+ fgets(&line[l-2], bufsize, fp);
diff --git a/games-simulation/csmash/csmash-x-inc.patch
b/games-simulation/csmash/csmash-x-inc.patch
new file mode 100644
index 0000000..9dec5a6
--- /dev/null
+++ b/games-simulation/csmash/csmash-x-inc.patch
@@ -0,0 +1,15 @@
+--- configure
++++ configure
+@@ -5515,7 +5515,11 @@
+ fi
+
+
+-CFLAGS="-I $x_includes"
++if test "x$x_includes" != "x"; then
++ CFLAGS="-I $x_includes"
++else
++ CFLAGS=""
++fi
+ LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+ CXXFLAGS="$CFLAGS -Wall"
+



  • [SM-Commit] GIT changes to master games grimoire by Pol Vinogradov (165c4dcb7b79f9c75a87ae9d53ae2a8fbeb5f476), Pol Vinogradov, 01/03/2007

Archive powered by MHonArc 2.6.24.

Top of Page