From 7d75ab23625c486f833b2952273fe4c0d29819f5 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 25 Sep 2021 23:21:06 +1000
Subject: [PATCH] XMoto: fix build for x86 arch

---
 .../xmoto/patches/xmoto-0.6.1.patchset        | 37 ++++++++++++++++++-
 games-sports/xmoto/xmoto-0.6.1.recipe         |  2 +-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/games-sports/xmoto/patches/xmoto-0.6.1.patchset b/games-sports/xmoto/patches/xmoto-0.6.1.patchset
index c34963793..7cc3dc3d4 100644
--- a/games-sports/xmoto/patches/xmoto-0.6.1.patchset
+++ b/games-sports/xmoto/patches/xmoto-0.6.1.patchset
@@ -1,4 +1,4 @@
-From 3fd27675e042054ab0a7ad62ec8431b891c75a50 Mon Sep 17 00:00:00 2001
+From 5849bcfdda31b2706a0bcb7cc5c6a3ad2e2edf21 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Sat, 25 Sep 2021 22:40:52 +1000
 Subject: Haiku fixes
@@ -162,3 +162,38 @@ index 1968294..42a8d79 100644
 -- 
 2.30.2
 
+
+From d59369121818b733743eea2f7b135feafe2d547a Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sat, 25 Sep 2021 23:19:40 +1000
+Subject: Use system int defs
+
+
+diff --git a/vendor/ode/include/ode/odeconfig.h b/vendor/ode/include/ode/odeconfig.h
+index 6e32fc6..ddb6f3f 100644
+--- a/vendor/ode/include/ode/odeconfig.h
++++ b/vendor/ode/include/ode/odeconfig.h
+@@ -38,6 +38,12 @@
+ #endif
+ 
+ /* Well-defined common data types...need to define for 64 bit systems */
++#ifdef __HAIKU__
++#include <SupportDefs.h>
++#if defined(__x86_64__)
++  #define X86_64_SYSTEM   1
++#endif
++#else
+ #if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
+   #define X86_64_SYSTEM   1
+   typedef int             int32;
+@@ -54,6 +60,7 @@
+   typedef signed char     int8;
+   typedef unsigned char   uint8;
+ #endif
++#endif
+ 
+ /* Visual C does not define these functions */
+ #if defined(_MSC_VER)
+-- 
+2.30.2
+
diff --git a/games-sports/xmoto/xmoto-0.6.1.recipe b/games-sports/xmoto/xmoto-0.6.1.recipe
index 5a10f3960..02e14bbbe 100644
--- a/games-sports/xmoto/xmoto-0.6.1.recipe
+++ b/games-sports/xmoto/xmoto-0.6.1.recipe
@@ -6,7 +6,7 @@ difficult of the challenges."
 HOMEPAGE="https://xmoto.tuxfamily.org"
 COPYRIGHT="2005-2021 Tuxfamily"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/xmoto/xmoto/archive/$portVersion/$portVersion.tar.gz"
 CHECKSUM_SHA256="209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66"
 PATCHES="xmoto-$portVersion.patchset"