[csw-devel] SF.net SVN: gar:[12235] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Jan 7 14:56:17 CET 2011


Revision: 12235
          http://gar.svn.sourceforge.net/gar/?rev=12235&view=rev
Author:   dmichelsen
Date:     2011-01-07 13:56:17 +0000 (Fri, 07 Jan 2011)

Log Message:
-----------
bzflag: Initial commit

Added Paths:
-----------
    csw/mgar/pkg/bzflag/
    csw/mgar/pkg/bzflag/branches/
    csw/mgar/pkg/bzflag/tags/
    csw/mgar/pkg/bzflag/trunk/
    csw/mgar/pkg/bzflag/trunk/Makefile
    csw/mgar/pkg/bzflag/trunk/checksums
    csw/mgar/pkg/bzflag/trunk/files/
    csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch
    csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch
    csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch
    csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch
    csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch


Property changes on: csw/mgar/pkg/bzflag/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/bzflag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzflag/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/Makefile	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,37 @@
+# $Id$
+NAME = bzflag
+VERSION = 2.0.16
+CATEGORIES = apps
+
+DESCRIPTION = A free multiplayer multiplatform 3D tank battle game
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES  = $(DISTNAME).tar.bz2
+
+PATCHFILES += 0001-Fix-ambiguity-between-double-and-long-double.patch
+PATCHFILES += 0002-Make-function-location-explicit.patch
+PATCHFILES += 0003-Force-inclusion-of-glew.h-before-gl.h.patch
+PATCHFILES += 0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch
+PATCHFILES += 0005-Make-arguments-constant-as-required.patch
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+TEST_TARGET = check
+
+RUNTIME_DEP_PKGS_CSWbzflag += CSWglew
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl
+RUNTIME_DEP_PKGS_CSWbzflag += CSWcurlrt
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibidn
+RUNTIME_DEP_PKGS_CSWbzflag += CSWzlib
+RUNTIME_DEP_PKGS_CSWbzflag += CSWmesa
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcares
+RUNTIME_DEP_PKGS_CSWbzflag += CSWnas
+RUNTIME_DEP_PKGS_CSWbzflag += CSWosslrt
+RUNTIME_DEP_PKGS_CSWbzflag += CSWoldaprt
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/bzflag/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/bzflag/trunk/checksums
===================================================================
--- csw/mgar/pkg/bzflag/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/checksums	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1 @@
+161b973bee586d43ebff4695dfb8c359  bzflag-2.0.16.tar.bz2

Added: csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,25 @@
+From 87ea1e52b98d43252aecc3911ff96d3a6444dbe3 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Jan 2011 13:43:07 +0100
+Subject: [PATCH 1/5] Fix ambiguity between double and long double
+
+---
+ src/bzflag/ServerMenu.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/bzflag/ServerMenu.cxx b/src/bzflag/ServerMenu.cxx
+index ebd00f2..f5db381 100644
+--- a/src/bzflag/ServerMenu.cxx
++++ b/src/bzflag/ServerMenu.cxx
+@@ -354,7 +354,7 @@ void ServerMenu::setSelected(int index, bool forcerefresh)
+ 	}
+ 	else {
+ 	  // colorize servers: many shots->red, jumping->green, CTF->blue
+-	  const float rf = std::min(1.0f, logf(server.ping.maxShots) / logf(20.0f));
++	  const float rf = std::min(1.0f, logf( (double) server.ping.maxShots) / logf( (double) 20.0f));
+ 	  const float gf = gameStyle & JumpingGameStyle ? 1.0f : 0.0f;
+ 	  const float bf = gameStyle & TeamFlagGameStyle ? 1.0f : 0.0f;
+ 	  label->setColor(0.5f + rf * 0.5f, 0.5f + gf * 0.5f, 0.5f + bf * 0.5f);
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,43 @@
+From d116c7dabfe30093c09b151f9344fbc296716a05 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Jan 2011 13:47:21 +0100
+Subject: [PATCH 2/5] Make function location explicit
+
+---
+ src/common/WordFilter.cxx |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/common/WordFilter.cxx b/src/common/WordFilter.cxx
+index 2d65dc2..fe62f4d 100644
+--- a/src/common/WordFilter.cxx
++++ b/src/common/WordFilter.cxx
+@@ -49,7 +49,7 @@ bool WordFilter::simpleFilter(char *input) const
+ 
+     word = line.substr(startPosition, endPosition-startPosition);
+     // transform to lowercase
+-    transform (word.begin(), word.end(), word.begin(), tolower);
++    std::transform (word.begin(), word.end(), word.begin(), tolower);
+ 
+     findWord.word = word;
+     firstchar = (unsigned char)word[0];
+@@ -778,7 +778,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose)
+     }
+ 
+     // convert the word to lowercase
+-    transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower);
++    std::transform (filterWord.begin(),filterWord.end(), filterWord.begin(), tolower);
+ 
+     bool added = addToFilter(filterWord, std::string(""));
+     if ((!added) && (verbose)) {
+@@ -800,7 +800,7 @@ unsigned int WordFilter::loadFromFile(const std::string &fileName, bool verbose)
+  * pattern match (default) catching hundreds of variations per filter
+  * word or using a simple exact word match technique (original).
+  */
+-bool WordFilter::filter(char *input, bool simple) const
++bool WordFilter::filter(char *input, const bool simple) const
+ {
+ #ifdef DEBUG
+   TimeKeeper before = TimeKeeper::getCurrent();
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,24 @@
+From 0d728c7a76f0a0e37e88262059fce9d850963242 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Jan 2011 13:47:41 +0100
+Subject: [PATCH 3/5] Force inclusion of glew.h before gl.h
+
+---
+ src/platform/XWindow.cxx |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/platform/XWindow.cxx b/src/platform/XWindow.cxx
+index 3c56476..c802bf8 100644
+--- a/src/platform/XWindow.cxx
++++ b/src/platform/XWindow.cxx
+@@ -10,6 +10,7 @@
+  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+  */
+ 
++#include "GL/glew.h"
+ #include "XWindow.h"
+ #include "XVisual.h"
+ #include "OpenGLGState.h"
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,25 @@
+From 8516009f9e7d257c396a7e9729be468089bd3da0 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Jan 2011 13:48:16 +0100
+Subject: [PATCH 4/5] Do not use const as non-const is required at some place
+
+---
+ src/bzflag/HUDuiList.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/bzflag/HUDuiList.cxx b/src/bzflag/HUDuiList.cxx
+index 201a711..77afc01 100644
+--- a/src/bzflag/HUDuiList.cxx
++++ b/src/bzflag/HUDuiList.cxx
+@@ -57,7 +57,7 @@ void			HUDuiList::update()
+   setIndex(index);
+ }
+ 
+-void			HUDuiList::createSlider(const int numValues)
++void			HUDuiList::createSlider(int numValues)
+ {
+   // create a slider with numValues options
+   /* createSlider(4) does the equivalent of
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch	2011-01-07 13:56:17 UTC (rev 12235)
@@ -0,0 +1,25 @@
+From 6b65d1feeec8c055edafb80172beff75e617abac Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 7 Jan 2011 13:48:46 +0100
+Subject: [PATCH 5/5] Make arguments constant as required
+
+---
+ src/common/VotingBooth.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/common/VotingBooth.cxx b/src/common/VotingBooth.cxx
+index e36f446..29f9238 100644
+--- a/src/common/VotingBooth.cxx
++++ b/src/common/VotingBooth.cxx
+@@ -85,7 +85,7 @@ bool VotingBooth::hasVoted(const std::string voterName) const
+ }
+ 
+ 
+-bool VotingBooth::vote(std::string voterName, std::string response)
++bool VotingBooth::vote(const std::string voterName, const std::string response)
+ {
+   if (this->hasVoted(voterName)) {
+     /* voters are not allowed to vote multiple times */
+-- 
+1.7.3.2
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list