[teeworlds] 01/02: Fix FTBFS with GCC 6.
Felix Geyer
fgeyer at moszumanska.debian.org
Fri Jul 1 18:48:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
fgeyer pushed a commit to branch master
in repository teeworlds.
commit 85b30b2711ab0d7e356cc21dfb4f9f3eb1b8e8ea
Author: Felix Geyer <fgeyer at debian.org>
Date: Fri Jul 1 19:29:51 2016 +0200
Fix FTBFS with GCC 6.
* Fix FTBFS with GCC 6. (Closes: #811757)
- Add fix-gcc6-rename-round.patch
- Add fix-gcc6-var-types.patch
---
debian/changelog | 8 +++
debian/patches/fix-gcc6-rename-round.patch | 99 ++++++++++++++++++++++++++++++
debian/patches/fix-gcc6-var-types.patch | 78 +++++++++++++++++++++++
debian/patches/series | 2 +
4 files changed, 187 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8c408dd..2b4c5d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+teeworlds (0.6.3+dfsg-2) UNRELEASED; urgency=medium
+
+ * Fix FTBFS with GCC 6. (Closes: #811757)
+ - Add fix-gcc6-rename-round.patch
+ - Add fix-gcc6-var-types.patch
+
+ -- Felix Geyer <fgeyer at debian.org> Fri, 01 Jul 2016 19:27:22 +0200
+
teeworlds (0.6.3+dfsg-1) unstable; urgency=medium
* New upstream release. (Closes: #789979)
diff --git a/debian/patches/fix-gcc6-rename-round.patch b/debian/patches/fix-gcc6-rename-round.patch
new file mode 100644
index 0000000..461b852
--- /dev/null
+++ b/debian/patches/fix-gcc6-rename-round.patch
@@ -0,0 +1,99 @@
+From bdd4b8c2b0ce4be986cb51a1dbc5d05db9a76867 Mon Sep 17 00:00:00 2001
+From: SushiTee <weichel.sascha at xxx.xx>
+Date: Mon, 9 Dec 2013 14:00:24 +0100
+Subject: [PATCH] fixed compiling using visual studio 2013 by renaming the
+ round function
+
+---
+ src/base/math.h | 2 +-
+ src/game/collision.h | 4 ++--
+ src/game/editor/layer_tiles.cpp | 2 +-
+ src/game/gamecore.cpp | 16 ++++++++--------
+ src/game/server/entity.cpp | 4 ++--
+ 5 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/base/math.h b/src/base/math.h
+index d58dbf1..07b0639 100644
+--- a/src/base/math.h
++++ b/src/base/math.h
+@@ -20,7 +20,7 @@ inline float sign(float f)
+ return f<0.0f?-1.0f:1.0f;
+ }
+
+-inline int round(float f)
++inline int round_to_int(float f)
+ {
+ if(f > 0)
+ return (int)(f+0.5f);
+diff --git a/src/game/collision.h b/src/game/collision.h
+index d16f2d5..cad75bb 100644
+--- a/src/game/collision.h
++++ b/src/game/collision.h
+@@ -25,9 +25,9 @@ class CCollision
+
+ CCollision();
+ void Init(class CLayers *pLayers);
+- bool CheckPoint(float x, float y) { return IsTileSolid(round(x), round(y)); }
++ bool CheckPoint(float x, float y) { return IsTileSolid(round_to_int(x), round_to_int(y)); }
+ bool CheckPoint(vec2 Pos) { return CheckPoint(Pos.x, Pos.y); }
+- int GetCollisionAt(float x, float y) { return GetTile(round(x), round(y)); }
++ int GetCollisionAt(float x, float y) { return GetTile(round_to_int(x), round_to_int(y)); }
+ int GetWidth() { return m_Width; };
+ int GetHeight() { return m_Height; };
+ int IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision);
+diff --git a/src/game/editor/layer_tiles.cpp b/src/game/editor/layer_tiles.cpp
+index 032f391..0cdd760 100644
+--- a/src/game/editor/layer_tiles.cpp
++++ b/src/game/editor/layer_tiles.cpp
+@@ -248,7 +248,7 @@ void CLayerTiles::BrushFlipY()
+
+ void CLayerTiles::BrushRotate(float Amount)
+ {
+- int Rotation = (round(360.0f*Amount/(pi*2))/90)%4; // 0=0�, 1=90�, 2=180�, 3=270�
++ int Rotation = (round_to_int(360.0f*Amount/(pi*2))/90)%4; // 0=0�, 1=90�, 2=180�, 3=270�
+ if(Rotation < 0)
+ Rotation +=4;
+
+diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
+index d43492a..a325a53 100644
+--- a/src/game/gamecore.cpp
++++ b/src/game/gamecore.cpp
+@@ -401,17 +401,17 @@ void CCharacterCore::Move()
+
+ void CCharacterCore::Write(CNetObj_CharacterCore *pObjCore)
+ {
+- pObjCore->m_X = round(m_Pos.x);
+- pObjCore->m_Y = round(m_Pos.y);
++ pObjCore->m_X = round_to_int(m_Pos.x);
++ pObjCore->m_Y = round_to_int(m_Pos.y);
+
+- pObjCore->m_VelX = round(m_Vel.x*256.0f);
+- pObjCore->m_VelY = round(m_Vel.y*256.0f);
++ pObjCore->m_VelX = round_to_int(m_Vel.x*256.0f);
++ pObjCore->m_VelY = round_to_int(m_Vel.y*256.0f);
+ pObjCore->m_HookState = m_HookState;
+ pObjCore->m_HookTick = m_HookTick;
+- pObjCore->m_HookX = round(m_HookPos.x);
+- pObjCore->m_HookY = round(m_HookPos.y);
+- pObjCore->m_HookDx = round(m_HookDir.x*256.0f);
+- pObjCore->m_HookDy = round(m_HookDir.y*256.0f);
++ pObjCore->m_HookX = round_to_int(m_HookPos.x);
++ pObjCore->m_HookY = round_to_int(m_HookPos.y);
++ pObjCore->m_HookDx = round_to_int(m_HookDir.x*256.0f);
++ pObjCore->m_HookDy = round_to_int(m_HookDir.y*256.0f);
+ pObjCore->m_HookedPlayer = m_HookedPlayer;
+ pObjCore->m_Jumped = m_Jumped;
+ pObjCore->m_Direction = m_Direction;
+diff --git a/src/game/server/entity.cpp b/src/game/server/entity.cpp
+index 788c3f4..3b47e02 100644
+--- a/src/game/server/entity.cpp
++++ b/src/game/server/entity.cpp
+@@ -51,6 +51,6 @@ int CEntity::NetworkClipped(int SnappingClient, vec2 CheckPos)
+
+ bool CEntity::GameLayerClipped(vec2 CheckPos)
+ {
+- return round(CheckPos.x)/32 < -200 || round(CheckPos.x)/32 > GameServer()->Collision()->GetWidth()+200 ||
+- round(CheckPos.y)/32 < -200 || round(CheckPos.y)/32 > GameServer()->Collision()->GetHeight()+200 ? true : false;
++ return round_to_int(CheckPos.x)/32 < -200 || round_to_int(CheckPos.x)/32 > GameServer()->Collision()->GetWidth()+200 ||
++ round_to_int(CheckPos.y)/32 < -200 || round_to_int(CheckPos.y)/32 > GameServer()->Collision()->GetHeight()+200 ? true : false;
+ }
diff --git a/debian/patches/fix-gcc6-var-types.patch b/debian/patches/fix-gcc6-var-types.patch
new file mode 100644
index 0000000..dd3a941
--- /dev/null
+++ b/debian/patches/fix-gcc6-var-types.patch
@@ -0,0 +1,78 @@
+From 52053d003d21f395573d430250a56f8f7410625d Mon Sep 17 00:00:00 2001
+From: oy <Tom_Adams at web.de>
+Date: Mon, 13 Jun 2016 09:27:09 +0200
+Subject: [PATCH] fixed some warnings
+
+---
+ bam.lua | 2 +-
+ datasrc/datatypes.py | 2 +-
+ src/engine/client/client.cpp | 2 +-
+ src/mastersrv/mastersrv.cpp | 2 +-
+ src/tools/crapnet.cpp | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/bam.lua b/bam.lua
+index 11ac7b9..3ac85f3 100644
+--- a/bam.lua
++++ b/bam.lua
+@@ -144,7 +144,7 @@ function build(settings)
+ settings.cc.Output = Intermediate_Output
+
+ if config.compiler.driver == "cl" then
+- settings.cc.flags:Add("/wd4244")
++ settings.cc.flags:Add("/wd4244", "/wd4577")
+ else
+ settings.cc.flags:Add("-Wall", "-fno-exceptions")
+ if family == "windows" then
+diff --git a/datasrc/datatypes.py b/datasrc/datatypes.py
+index 5441e37..f4ab825 100644
+--- a/datasrc/datatypes.py
++++ b/datasrc/datatypes.py
+@@ -147,7 +147,7 @@ def __init__(self, value):
+ def Set(self, value):
+ self.value = value
+ def EmitDefinition(self, name):
+- return ["%f"%self.value]
++ return ["%ff"%self.value]
+ #return ["%d /* %s */"%(self.value, self._target_name)]
+
+ class String(BaseType):
+diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
+index 2bf3d48..c5e1475 100644
+--- a/src/engine/client/client.cpp
++++ b/src/engine/client/client.cpp
+@@ -935,7 +935,7 @@ void CClient::ProcessConnlessPacket(CNetChunk *pPacket)
+ {
+ NETADDR Addr;
+
+- static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
++ static unsigned char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
+
+ // copy address
+ if(!mem_comp(IPV4Mapping, pAddrs[i].m_aIp, sizeof(IPV4Mapping)))
+diff --git a/src/mastersrv/mastersrv.cpp b/src/mastersrv/mastersrv.cpp
+index 1098123..eee3050 100644
+--- a/src/mastersrv/mastersrv.cpp
++++ b/src/mastersrv/mastersrv.cpp
+@@ -117,7 +117,7 @@ void BuildPackets()
+ }
+ else
+ {
+- static char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
++ static unsigned char IPV4Mapping[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF };
+
+ mem_copy(m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp, IPV4Mapping, sizeof(IPV4Mapping));
+ m_aPackets[m_NumPackets-1].m_Data.m_aServers[PacketIndex].m_aIp[12] = pCurrent->m_Address.ip[0];
+diff --git a/src/tools/crapnet.cpp b/src/tools/crapnet.cpp
+index 95a4d15..9979d00 100644
+--- a/src/tools/crapnet.cpp
++++ b/src/tools/crapnet.cpp
+@@ -42,7 +42,7 @@ static int m_ConfigInterval = 10; // seconds between different pingconfigs
+ static int m_ConfigLog = 0;
+ static int m_ConfigReorder = 0;
+
+-void Run(int Port, NETADDR Dest)
++void Run(unsigned short Port, NETADDR Dest)
+ {
+ NETADDR Src = {NETTYPE_IPV4, {0,0,0,0}, Port};
+ NETSOCKET Socket = net_udp_create(Src);
diff --git a/debian/patches/series b/debian/patches/series
index 7cc41df..b0b8d39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ system-libs.patch
new-wavpack.patch
set-data-dir.patch
pass-build-flags.patch
+fix-gcc6-rename-round.patch
+fix-gcc6-var-types.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/teeworlds.git
More information about the Pkg-games-commits
mailing list