[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.6+dfsg-2-7-gea5038a

Scott Howard showard314 at gmail.com
Thu Nov 11 00:57:33 UTC 2010


The following commit has been merged in the master branch:
commit ea5038aafbdb5d4b1e564d91f0ed9e972bb0f3e0
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Nov 10 19:43:07 2010 -0500

    Fixed a FTBFS on big endian machines due to wrong type used in function call

diff --git a/debian/changelog b/debian/changelog
index 77366e6..fe485b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sandboxgamemaker (2.6.1+dfsg-2) experimental; urgency=low
+
+  * debian/patches/fix_ftbfs_bigendian.patch
+    - Fixed a FTBFS on big endian machines due to wrong type used in 
+      function call
+
+ -- Scott Howard <showard314 at gmail.com>  Wed, 10 Nov 2010 19:33:59 -0500
+
 sandboxgamemaker (2.6.1+dfsg-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/fix_ftbfs_bigendian.patch b/debian/patches/fix_ftbfs_bigendian.patch
new file mode 100644
index 0000000..c462b3a
--- /dev/null
+++ b/debian/patches/fix_ftbfs_bigendian.patch
@@ -0,0 +1,44 @@
+Description: Fixed a FTBFS on big endian machines due to wrong type used in
+ function call
+Author: Scott Howard <showard314 at gmail.com>
+Index: sandboxgamemaker/src/rpggame/rpgio.cpp
+===================================================================
+--- sandboxgamemaker.orig/src/rpggame/rpgio.cpp	2010-11-10 19:37:42.000000000 -0500
++++ sandboxgamemaker/src/rpggame/rpgio.cpp	2010-11-10 19:41:33.551787089 -0500
+@@ -309,11 +309,12 @@
+ 		lilswap(&base->base.experience, 3);
+ 		lilswap(&base->base.baseattrs[0], STAT_MAX * 2 + SKILL_MAX * 2);
+ 
+-		lilswap(&base->base.bonusthresh, ATTACK_MAX * 2);
++		lilswap(&base->base.bonusthresh[0], ATTACK_MAX * 2);
+ 		lilswap(&base->base.bonushealth, 6);
++
+ 		lilswap(&base->base.bonushregen, 2);
+ 
+-		lilswap(&base->base.deltathresh, ATTACK_MAX * 2);
++		lilswap(&base->base.deltathresh[0], ATTACK_MAX * 2);
+ 		lilswap(&base->base.deltahealth, 6);
+ 		lilswap(&base->base.deltahregen, 2);
+ 
+@@ -972,11 +973,11 @@
+ 		lilswap(&tmp.experience, 3);
+ 		lilswap(&tmp.baseattrs[0], STAT_MAX * 2 + SKILL_MAX * 2);
+ 
+-		lilswap(&tmp.bonusthresh, ATTACK_MAX * 2);
++		lilswap(&tmp.bonusthresh[0], ATTACK_MAX * 2);
+ 		lilswap(&tmp.bonushealth, 6);
+ 		lilswap(&tmp.bonushregen, 2);
+ 
+-		lilswap(&tmp.deltathresh, ATTACK_MAX * 2);
++		lilswap(&tmp.deltathresh[0], ATTACK_MAX * 2);
+ 		lilswap(&tmp.deltahealth, 6);
+ 		lilswap(&tmp.deltahregen, 2);
+ 
+@@ -1003,6 +1004,7 @@
+ 			f->putlil(fact->relations[i]);
+ 	}
+ 
++
+ 	void writeobject(stream *f, object_base *obj)
+ 	{
+ 		writestring(f, obj->mdl);
diff --git a/debian/patches/series b/debian/patches/series
index d186bbc..5de4ba6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ wx_launcher_paths.patch
 debianizing_makefiles.patch
 linux_launcher.patch
 libenet_1.3_add.patch
+fix_ftbfs_bigendian.patch

-- 
Standalone 3D Game Maker and 3D Game Design program



More information about the Pkg-games-commits mailing list