From 17a0fa98c7cf7fa72b438e0655d784ec6d7f7dd6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 17 May 2020 19:46:01 +1000
Subject: [PATCH] OpenJK:Outcast: fix build for x86

---
 .../openjk_outcast-2020.03.09.recipe          |  2 +-
 .../openjk_outcast-2020.03.09.patchset        | 46 ++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/games-fps/openjk_outcast/openjk_outcast-2020.03.09.recipe b/games-fps/openjk_outcast/openjk_outcast-2020.03.09.recipe
index 0b9913492..4504f3e80 100644
--- a/games-fps/openjk_outcast/openjk_outcast-2020.03.09.recipe
+++ b/games-fps/openjk_outcast/openjk_outcast-2020.03.09.recipe
@@ -18,7 +18,7 @@ OpenJK does not have Jedi Outcast multiplayer support."
 HOMEPAGE="https://github.com/JACoders/OpenJK"
 COPYRIGHT="2003 Activision"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 srcGitRev="52030235f052772008d99e6ccb16de48e7ddb688"
 SOURCE_URI="https://github.com/JACoders/OpenJK/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="2b6fadf16cca2fdf4cce32f977e0d0aa34e2a19d1c596b996f9857b6a97c7d32"
diff --git a/games-fps/openjk_outcast/patches/openjk_outcast-2020.03.09.patchset b/games-fps/openjk_outcast/patches/openjk_outcast-2020.03.09.patchset
index 3e50f02e0..7459bd713 100644
--- a/games-fps/openjk_outcast/patches/openjk_outcast-2020.03.09.patchset
+++ b/games-fps/openjk_outcast/patches/openjk_outcast-2020.03.09.patchset
@@ -1,4 +1,4 @@
-From ed78e7f69f63427478b6ba7840ce2a59c9926763 Mon Sep 17 00:00:00 2001
+From 2920082bd41da0ea6cb17063199249aac9fb36fd Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Wed, 30 Oct 2019 00:18:24 +1000
 Subject: Add Haiku support
@@ -175,10 +175,10 @@ index 96f5b7a..c90f068 100644
  char *Sys_DefaultHomePath(void)
  {
 -- 
-2.24.1
+2.26.0
 
 
-From ca86ff450d595d8cadc870046f6e745e0bdf3a94 Mon Sep 17 00:00:00 2001
+From c3792bb585a07b733b865c0758da464b8fb8a2b5 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 10 Mar 2020 20:22:50 +1000
 Subject: use internal zlib
@@ -198,10 +198,10 @@ index 4ef4c7e..a25a99a 100644
  endif()
  
 -- 
-2.24.1
+2.26.0
 
 
-From 08527006262a9779aa9381a8f8476a1d5d514d10 Mon Sep 17 00:00:00 2001
+From 852623e0b9ae74f3cd8c6965c203172493a95ac7 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
 Date: Tue, 10 Mar 2020 23:03:41 +1000
 Subject: Don't use ATTY for Haiku
@@ -225,5 +225,39 @@ index c90f068..8e7975e 100644
  
  void Sys_PlatformExit( void )
 -- 
-2.24.1
+2.26.0
+
+
+From 2e10b2e5b459cae69d0e9d8f341504d93c14c8cc Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Sun, 17 May 2020 19:32:11 +1000
+Subject: Fix build for x86
+
+
+diff --git a/code/mp3code/config.h b/code/mp3code/config.h
+index 36a2651..2c2dd35 100644
+--- a/code/mp3code/config.h
++++ b/code/mp3code/config.h
+@@ -59,6 +59,10 @@ typedef int socklen_t;
+ // real number
+ typedef double real;
+ 
++#ifdef __HAIKU__
++#include <SupportDefs.h>
++#else
++
+ #if UCHAR_MAX == 0xff
+ 
+ typedef unsigned char	uint8;
+@@ -101,7 +105,7 @@ typedef short			int32;
+ #else
+ #error This machine has no 32-bit type
+ #endif
+-
++#endif
+ 
+ // What character marks the end of a directory entry? For DOS and
+ // Windows, it is "\"; in UNIX it is "/".
+-- 
+2.26.0