[csw-devel] SF.net SVN: gar:[18563] csw/mgar/pkg/bzflag/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Jun 27 14:44:42 CEST 2012


Revision: 18563
          http://gar.svn.sourceforge.net/gar/?rev=18563&view=rev
Author:   dmichelsen
Date:     2012-06-27 12:44:42 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------
bzflag/trunk: Update to 2.4.0

Modified Paths:
--------------
    csw/mgar/pkg/bzflag/trunk/Makefile
    csw/mgar/pkg/bzflag/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch

Removed Paths:
-------------
    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

Modified: csw/mgar/pkg/bzflag/trunk/Makefile
===================================================================
--- csw/mgar/pkg/bzflag/trunk/Makefile	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/Makefile	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = bzflag
-VERSION = 2.0.16
+VERSION = 2.4.0
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -11,26 +11,22 @@
 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
+PATCHFILES += 0001-Keep-norunpath.patch
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
-CONFIGURE_ARGS = $(DIRPATHS)
+libdir_install = $(prefix)/lib/bzflag
 
-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 += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibz1
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcurl4
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibglew1-7
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibsdl1-2-0
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibcares2
+RUNTIME_DEP_PKGS_CSWbzflag += CSWlibidn11
+# Old-style deps
 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
 
+EXTRA_LINKER_FLAGS += -norunpath
+
 include gar/category.mk

Modified: csw/mgar/pkg/bzflag/trunk/checksums
===================================================================
--- csw/mgar/pkg/bzflag/trunk/checksums	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/checksums	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1 +1 @@
-161b973bee586d43ebff4695dfb8c359  bzflag-2.0.16.tar.bz2
+5b38894b7a7f883ffbe8f5e4c580ee25  bzflag-2.4.0.tar.bz2

Deleted: 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	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/files/0001-Fix-ambiguity-between-double-and-long-double.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,25 +0,0 @@
-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/0001-Keep-norunpath.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch	                        (rev 0)
+++ csw/mgar/pkg/bzflag/trunk/files/0001-Keep-norunpath.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -0,0 +1,25 @@
+From 24f77d89889796113fd16899559117914040afe2 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <da\xC2m at opencsw.org>
+Date: Wed, 27 Jun 2012 14:10:16 +0200
+Subject: [PATCH] Keep -norunpath
+
+---
+ misc/ltmain.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/misc/ltmain.sh b/misc/ltmain.sh
+index d8efb57..819d4a2 100755
+--- a/misc/ltmain.sh
++++ b/misc/ltmain.sh
+@@ -5091,7 +5091,7 @@ func_mode_link ()
+       # @file                GCC response files
+       # -tp=*                Portland pgcc target processor selection
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-norunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+-- 
+1.7.10.3
+

Deleted: csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch
===================================================================
--- csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/files/0002-Make-function-location-explicit.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,43 +0,0 @@
-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
-

Deleted: 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	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/files/0003-Force-inclusion-of-glew.h-before-gl.h.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,24 +0,0 @@
-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
-

Deleted: 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	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/files/0004-Do-not-use-const-as-non-const-is-required-at-some-pl.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,25 +0,0 @@
-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
-

Deleted: 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	2012-06-27 11:10:49 UTC (rev 18562)
+++ csw/mgar/pkg/bzflag/trunk/files/0005-Make-arguments-constant-as-required.patch	2012-06-27 12:44:42 UTC (rev 18563)
@@ -1,25 +0,0 @@
-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