rpms/SolarModel/devel SolarModel-2.1-irrlicht1.6.patch, NONE, 1.1 SolarModel.spec, 1.4, 1.5

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/SolarModel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155

Modified Files:
	SolarModel.spec 
Added Files:
	SolarModel-2.1-irrlicht1.6.patch 
Log Message:
rebuild against irrlicht 1.6

SolarModel-2.1-irrlicht1.6.patch:
 GameCore.cpp     |    2 +-
 GameMain.cpp     |    2 +-
 GameMeasurer.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE SolarModel-2.1-irrlicht1.6.patch ---
diff -up SolarModel_src/GameCore.cpp.irrlicht1.6 SolarModel_src/GameCore.cpp
--- SolarModel_src/GameCore.cpp.irrlicht1.6	2008-05-28 22:32:54.000000000 -0400
+++ SolarModel_src/GameCore.cpp	2010-01-14 11:38:31.134244420 -0500
@@ -125,7 +125,7 @@ void GameCreateIrrLicht(GameStruct *pGam
 {
 	pGame->Device = createDevice(
 		pGame->DriverType,
-		core::dimension2d<s32>( pGame->Width, pGame->Height ),
+		core::dimension2d<u32>( pGame->Width, pGame->Height ),
 		pGame->BitsPerPixel,
 		pGame->Fullscreen,
 		false, // Game.StencilBuffer
diff -up SolarModel_src/GameMain.cpp.irrlicht1.6 SolarModel_src/GameMain.cpp
--- SolarModel_src/GameMain.cpp.irrlicht1.6	2010-01-14 11:38:31.123370339 -0500
+++ SolarModel_src/GameMain.cpp	2010-01-14 11:42:11.934372782 -0500
@@ -105,7 +105,7 @@ void GameInit()
 
 	srand(Game.Timer->getRealTime());
 
-	Game.Video->setFog(video::SColor(0,8,8,8), true, 500.0f, 1200.0f);
+	Game.Video->setFog(video::SColor(0,8,8,8), video::EFT_FOG_LINEAR, 500.0f, 1200.0f);
 
 	// Maps setup
 
diff -up SolarModel_src/GameMeasurer.cpp.irrlicht1.6 SolarModel_src/GameMeasurer.cpp
--- SolarModel_src/GameMeasurer.cpp.irrlicht1.6	2010-01-14 11:38:31.123370339 -0500
+++ SolarModel_src/GameMeasurer.cpp	2010-01-14 11:38:31.134244420 -0500
@@ -253,7 +253,7 @@ void GameMeasurer::BodyUserPosChanged()
 gotNewT:
 		canGotNewT = false;
 skipFalse:
-		core::dimension2d<s32> dim = font->getDimension(t.c_str());
+		core::dimension2d<u32> dim = font->getDimension(t.c_str());
 		int tX = int(x-dim.Width/2);
 		if (tX < 0) { if (canGotNewT) {t=core::stringw("<-")+t; goto gotNewT;} else tX=0; }
 		if (tX+dim.Width > Game.Width) { if (canGotNewT) {t+="->"; goto gotNewT;} else tX=Game.Width-dim.Width; }


Index: SolarModel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/SolarModel/devel/SolarModel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- SolarModel.spec	24 Jul 2009 16:24:08 -0000	1.4
+++ SolarModel.spec	14 Jan 2010 16:51:41 -0000	1.5
@@ -1,7 +1,7 @@
 Name:		SolarModel
 Summary: 	Real-time 3D Solar System simulation
 Version:	2.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL+
 Group:		System Environment/Base
 Source0:	http://downloads.sourceforge.net/solarmodel/%{name}_src_2_1.zip
@@ -15,6 +15,8 @@ Source4:	SolarModel.png
 # Use RPM_OPT_FLAGS
 # Fix swprintf/Linux related issues
 Patch0:		SolarModel-2.1-Fedora.patch
+# Compile against irrlicht 1.6
+Patch1:		SolarModel-2.1-irrlicht1.6.patch
 URL:		http://www.ffsoftworks.com/solarmodel.php
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	irrlicht-devel, libXext-devel, libX11-devel, desktop-file-utils
@@ -31,6 +33,7 @@ in real-time flow). 
 %prep
 %setup -q -n %{name}_src
 %patch0 -p1 -b .Fedora
+%patch1 -p1 -b .irrlicht1.6
 
 for i in _dev/*.txt "_dev/map/*.txt"; do
 	sed -i 's/\r//' $i
@@ -67,6 +70,9 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/SolarModel.png
 
 %changelog
+* Thu Jan 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 2.1-6
+- bump for new irrlicht (1.6)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild