From 065bbd6a5e8ed97b18e3e41e154a56b3720b413a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 21 May 2020 22:58:43 +1000
Subject: [PATCH] XMoto: fix build for x86 arch

---
 .../xmoto/patches/xmoto-0.5.12.patchset       | 30 +++++++++++++++++--
 games-sports/xmoto/xmoto-0.5.12.recipe        |  2 +-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/games-sports/xmoto/patches/xmoto-0.5.12.patchset b/games-sports/xmoto/patches/xmoto-0.5.12.patchset
index b18cebd05..2f934e6ba 100644
--- a/games-sports/xmoto/patches/xmoto-0.5.12.patchset
+++ b/games-sports/xmoto/patches/xmoto-0.5.12.patchset
@@ -1,4 +1,4 @@
-From 15988873a3087de63eb0a74af6969cb88ca328e6 Mon Sep 17 00:00:00 2001
+From 4512ab9748a106f16eba86dcb755ef53b08bc864 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kamil=20Krzy=C5=BCanowski?= <kamnxt@kamnxt.com>
 Date: Fri, 12 Dec 2014 16:46:15 +0000
 Subject: Patched the files to make them work on haiku.
@@ -60,7 +60,7 @@ index 1803710..0d130aa 100644
 2.26.0
 
 
-From 430e807d6f38d97965f5943d849aac3daab43c83 Mon Sep 17 00:00:00 2001
+From 5a048f626ba39373bc8bab717356ec0c5f8d0e69 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 30 Oct 2019 13:49:11 +1000
 Subject: Fix build
@@ -132,7 +132,7 @@ index a61e753..c717010 100644
 2.26.0
 
 
-From cd5ae07d2e4aaa059957c7c006fef70dffdc004a Mon Sep 17 00:00:00 2001
+From 0b66f62ce479b6714609aed293e6e86a4cfa9705 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 20 May 2020 12:21:50 +1000
 Subject: Use find_directory
@@ -179,3 +179,27 @@ index cd95f58..d9b57ab 100644
 -- 
 2.26.0
 
+
+From 3fb6d712a2ce19d848f2abf63ff2e1aa0f4e7d8c Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 21 May 2020 22:53:05 +1000
+Subject: Hack for int32 conflict definitions
+
+
+diff --git a/src/VFileIO.cpp b/src/VFileIO.cpp
+index d9b57ab..de7b7fd 100644
+--- a/src/VFileIO.cpp
++++ b/src/VFileIO.cpp
+@@ -43,6 +43,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #include "UserConfig.h"
+ 
+ #ifdef __HAIKU__
++#define int32 FAKE_INT_TYPE
++#define uint32 FAKE_UINT_TYPE
++#include <SupportDefs.h>
+ #include <Path.h>
+ #include <FindDirectory.h>
+ #include <StorageDefs.h>
+-- 
+2.26.0
+
diff --git a/games-sports/xmoto/xmoto-0.5.12.recipe b/games-sports/xmoto/xmoto-0.5.12.recipe
index e483f9ef1..c38703d4c 100644
--- a/games-sports/xmoto/xmoto-0.5.12.recipe
+++ b/games-sports/xmoto/xmoto-0.5.12.recipe
@@ -9,7 +9,7 @@ COPYRIGHT="2006-2014 Nicolas Adenis-Lamarre
 	2009-2010 Jens Erler
 	2005-2006 Rasmus Neckelmann"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.tuxfamily.org/xmoto/xmoto/dev/xmoto-$portVersion-src-svn3427.tar.gz"
 CHECKSUM_SHA256="19785f67cc7bc575fa621adb4073a48314cb436ea4fe7a90fa4c03a12bde0325"
 PATCHES="xmoto-$portVersion.patchset"