--- a/ChangeLog Fri Dec 30 05:48:30 2011 +0000
+++ b/ChangeLog Fri Dec 30 10:07:14 2011 +0000
@@ -4,6 +4,7 @@
* SFElibwpg-gpp.spec: initial spec
* SFEinkscape.spec: fix 0.48.2 build, add libwpg
* SFElibmagick-gpp.spec: fork from SFEimagemagick for g++ libs
+ * SFEscorched3d.spec: bump to 43.2a
2011-12-28 Milan Jurik <[email protected]>
--- a/SFEscorched3d.spec Fri Dec 30 05:48:30 2011 +0000
+++ b/SFEscorched3d.spec Fri Dec 30 10:07:14 2011 +0000
@@ -7,52 +7,40 @@
#
%include Solaris.inc
-%define SFEfreetype %(/usr/bin/pkginfo -q SFEfreetype && echo 1 || echo 0)
-%define SFEsdl %(/usr/bin/pkginfo -q SFEsdl && echo 1 || echo 0)
%define SFEwxwidgets %(/usr/bin/pkginfo -q SFEwxwidgets && echo 1 || echo 0)
%define SFEfftw %(/usr/bin/pkginfo -q SFEfftw && echo 1 || echo 0)
-%define src_version 43.1c
+%define src_version 43.2a
-Name: SFEscorched3d
-Summary: A 3D game based on the classic DOS game, Scorched Earth
-Version: 43.1.0.3
-Source: %{sf_download}/scorched3d/Scorched3D-%{src_version}-src.tar.gz
-Source1: scorched3d.png
-Source2: scorched3d.desktop
-URL: http://www.scorched3d.co.uk/
-License: GPL
-Group: Amusements/Games
-Patch1: scorched3d-01-securid.diff
-Patch2: scorched3d-02-sunpro.diff
-Patch3: scorched3d-03-const.diff
-Patch4: scorched3d-04-prototype.diff
-Patch5: scorched3d-05-openal.diff
+Name: SFEscorched3d
+IPS_Package_Name: games/scorched3d
+Summary: A 3D game based on the classic DOS game, Scorched Earth
+Version: 43.2.0.1
+Source: %{sf_download}/scorched3d/Scorched3D-%{src_version}-src.tar.gz
+Source1: scorched3d.png
+Source2: scorched3d.desktop
+URL: http://www.scorched3d.co.uk/
+License: GPL
+Group: Amusements/Games
+Patch1: scorched3d-01-securid.diff
+Patch2: scorched3d-02-sunpro.diff
+Patch3: scorched3d-03-const.diff
+Patch5: scorched3d-05-openal.diff
-SUNW_BaseDir: %{_basedir}
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+SUNW_BaseDir: %{_basedir}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%include default-depend.inc
-%if %SFEsdl
-BuildRequires: SFEsdl-devel
-Requires: SFEsdl
-%else
BuildRequires: SUNWlibsdl-devel
Requires: SUNWlibsdl
-%endif
BuildRequires: SFEsdl-mixer-devel
Requires: SFEsdl-mixer
Requires: SUNWogg-vorbis
BuildRequires: SUNWogg-vorbis-devel
Requires: SFEopenal
BuildRequires: SFEopenal-devel
-%if %SFEfreetype
-BuildRequires: SFEfreetype-devel
-Requires: SFEfreetype
-%else
BuildRequires: SUNWfreetype2
Requires: SUNWfreetype2
-%endif
%if %SFEfftw
Requires: SFEfftw
BuildRequires: SFEfftw-devel
@@ -81,7 +69,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-#%patch4 -p1
%patch5 -p1
%build
@@ -135,6 +122,8 @@
%{_datadir}/*
%changelog
+* Fri Dec 30 2011 - Milan Jurik
+- bump to 43.2a
* Mon May 10 2010 - Milan Jurik
- use SUNWfftwX if possible
* Sun May 09 2010 - Milan Jurik
--- a/patches/scorched3d-01-securid.diff Fri Dec 30 05:48:30 2011 +0000
+++ b/patches/scorched3d-01-securid.diff Fri Dec 30 10:07:14 2011 +0000
@@ -1,6 +1,6 @@
---- scorched/src/client/client/SecureID.cpp Sun Mar 2 19:47:36 2008
-+++ scorched-patch/src/client/client/SecureID.cpp Sat May 8 12:28:54 2010
-@@ -38,6 +38,11 @@
+--- scorched/src/client/client/SecureID.cpp Tue Jul 20 02:28:59 2010
++++ scorched/src/client/client/SecureID.cpp Fri Dec 30 09:34:48 2011
+@@ -75,6 +75,11 @@
#include <sys/ioctl.h>
#include <net/if.h>
@@ -12,7 +12,7 @@
std::string SecureID::GetPrivateKey(void)
{
-@@ -73,7 +78,11 @@
+@@ -110,7 +115,11 @@
if_freenameindex(NameList); //free the memory
strcpy (dev.ifr_name, InterfaceName.c_str()); //select from the name
@@ -24,7 +24,7 @@
{
close(sock);
return ""; //cannot list the interfaces
-@@ -81,7 +90,11 @@
+@@ -118,7 +127,11 @@
for (int i=0; i<6; i++)
{
--- a/patches/scorched3d-03-const.diff Fri Dec 30 05:48:30 2011 +0000
+++ b/patches/scorched3d-03-const.diff Fri Dec 30 10:07:14 2011 +0000
@@ -1,5 +1,5 @@
---- scorched/src/server/tankai/TankAICurrentTarget.cpp Sat May 8 12:57:53 2010
-+++ scorched-patch/src/server/tankai/TankAICurrentTarget.cpp Sat May 8 12:57:40 2010
+--- scorched/src/server/tankai/TankAICurrentTarget.cpp Mon Dec 29 18:38:23 2008
++++ scorched/src/server/tankai/TankAICurrentTarget.cpp Fri Dec 30 10:00:26 2011
@@ -179,20 +179,20 @@
if (damageTaken_.find(currentTank) != damageTaken_.end())
@@ -34,9 +34,9 @@
}
// Form the final list
---- scorched/src/server/tankai/TankAIWeaponSets.cpp Sat May 8 12:58:13 2010
-+++ scorched-patch/src/server/tankai/TankAIWeaponSets.cpp Sat May 8 12:58:07 2010
-@@ -126,7 +126,7 @@
+--- scorched/src/server/tankai/TankAIWeaponSets.cpp Sun Jun 27 03:28:31 2010
++++ scorched/src/server/tankai/TankAIWeaponSets.cpp Fri Dec 30 10:00:26 2011
+@@ -119,7 +119,7 @@
if (weapon.weaponValid(tankAccessories, lastRound))
{
potentialWeapons.insert(
@@ -45,8 +45,8 @@
(weapon.prioritybuy, &weapon));
}
}
---- scorched/src/server/server/ServerStateEnoughPlayers.cpp Sat May 8 12:58:32 2010
-+++ scorched-patch/src/server/server/ServerStateEnoughPlayers.cpp Sat May 8 12:58:28 2010
+--- scorched/src/server/server/ServerStateEnoughPlayers.cpp Mon Jun 28 02:51:32 2010
++++ scorched/src/server/server/ServerStateEnoughPlayers.cpp Fri Dec 30 10:01:05 2011
@@ -171,7 +171,7 @@
{
unsigned int startTime = (unsigned int)
@@ -62,7 +62,7 @@
{
- std::pair<unsigned int, unsigned int> item = *aiItor;
+ std::pair<const unsigned int, unsigned int> item = *aiItor;
- ServerMessageHandler::instance()->destroyPlayer(
+ ScorchedServer::instance()->getServerMessageHandler().destroyPlayer(
item.second, "Auto-kick");
}
@@ -205,7 +205,7 @@
@@ -74,8 +74,8 @@
(current->getTankAI()->getName(),
current->getPlayerId()));
}
---- scorched/src/client/console/ConsoleRules.cpp Sat May 8 12:58:46 2010
-+++ scorched-patch/src/client/console/ConsoleRules.cpp Sat May 8 12:58:42 2010
+--- scorched/src/client/console/ConsoleRules.cpp Mon Feb 23 04:14:20 2009
++++ scorched/src/client/console/ConsoleRules.cpp Fri Dec 30 10:00:26 2011
@@ -38,7 +38,7 @@
std::string addName = rule->getName();
@@ -94,14 +94,14 @@
(int) rule->getParams().size(), rule));
}
---- scorched/src/common/landscapemap/HeightMap.cpp Sat May 8 12:59:03 2010
-+++ scorched-patch/src/common/landscapemap/HeightMap.cpp Sat May 8 12:58:56 2010
-@@ -36,7 +36,7 @@
- delete [] heightData_;
- }
+--- scorched-patch/src/common/landscapemap/HeightMap.h Wed May 19 01:12:10 2010
++++ scorched/src/common/landscapemap/HeightMap.h Fri Dec 30 10:09:27 2011
+@@ -34,7 +34,7 @@
+ HeightMap();
+ virtual ~HeightMap();
--void HeightMap::create(const int width, const int height)
-+void HeightMap::create(int width, int height)
- {
- width_ = width;
- height_ = height;
+- void create(int width, int height, bool invertedNormals);
++ void create(const int width, const int height, bool invertedNormals);
+ void reset();
+
+ // Height map size fns
--- a/patches/scorched3d-04-prototype.diff Fri Dec 30 05:48:30 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- scorched/src/landscapemap/HeightMap.h.orig Sun Sep 2 18:48:51 2007
-+++ scorched/src/landscapemap/HeightMap.h Fri Feb 22 17:25:32 2008
-@@ -60,7 +60,7 @@
- fixed getInterpHeight(fixed w, fixed h);
-
- // Get normal functions
-- inline FixedVector &getNormal(int w, int h);
-+ FixedVector &getNormal(int w, int h);
- void getInterpNormal(fixed w, fixed h, FixedVector &normal);
-
- bool getIntersect(Line &direction, Vector &intersect);