Ports/xash3d-fwgs: Update to 2022.07.14

Ports/xash3d-fwgs/patches/0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jesse Buhagiar <jooster669@gmail.com>
-Date: Sun, 2 Jan 2022 00:39:02 +1100
-Subject: [PATCH] Build: Add SerenityOS to list of compatible systems
-
-This is required by the build system to spit out a library with
-the correct name/platform.
----
- engine/common/build.c | 2 ++
- public/build.h        | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/engine/common/build.c b/engine/common/build.c
-index c4ddaee..42ba572 100644
---- a/engine/common/build.c
-+++ b/engine/common/build.c
-@@ -95,6 +95,8 @@ const char *Q_buildos( void )
- 	osname = "DOS4GW";
- #elif XASH_HAIKU
- 	osname = "haiku";
-+#elif XASH_SERENITY
-+	osname = "serenityos";
- #else
- #error "Place your operating system name here! If this is a mistake, try to fix conditions above and report a bug"
- #endif
-diff --git a/public/build.h b/public/build.h
-index 6e1f326..57a7735 100644
---- a/public/build.h
-+++ b/public/build.h
-@@ -74,6 +74,7 @@ For more information, please refer to <http://unlicense.org/>
- #undef XASH_RISCV_DOUBLEFP
- #undef XASH_RISCV_SINGLEFP
- #undef XASH_RISCV_SOFTFP
-+#undef XASH_SERENITY
- #undef XASH_WIN32
- #undef XASH_WIN64
- #undef XASH_X86
-@@ -125,6 +126,9 @@ For more information, please refer to <http://unlicense.org/>
- #elif defined __HAIKU__
- 	#define XASH_HAIKU 1
- 	#define XASH_POSIX 1
-+#elif defined __serenity__
-+	#define XASH_SERENITY 1
-+	#define XASH_POSIX 1
- #else
- #error "Place your operating system name here! If this is a mistake, try to fix conditions above and report a bug"
- #endif

Ports/xash3d-fwgs/patches/0001-engine-whereami-Add-SerenityOS.patch

@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Tim Schumacher <timschumi@gmx.de>
+Date: Thu, 14 Jul 2022 20:47:33 +0200
+Subject: [PATCH] engine: whereami: Add SerenityOS
+
+---
+ engine/common/whereami.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/engine/common/whereami.c b/engine/common/whereami.c
+index 79b01dc..02ded98 100644
+--- a/engine/common/whereami.c
++++ b/engine/common/whereami.c
+@@ -169,7 +169,7 @@ int WAI_PREFIX(getModulePath)(char* out, int capacity, int* dirname_length)
+   return length;
+ }
+ 
+-#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(WAI_USE_PROC_SELF_EXE)
++#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(__serenity__) || defined(WAI_USE_PROC_SELF_EXE)
+ 
+ #include <stdio.h>
+ #include <stdlib.h>

Ports/xash3d-fwgs/patches/0002-Engine-Keep-HTTP-from-endlessly-formatting-NaN-value.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tim Schumacher <timschumi@gmx.de>
-Date: Mon, 2 May 2022 01:22:35 +0200
-Subject: [PATCH] Engine: Keep HTTP from endlessly formatting NaN values
-
-For whatever reason, our progress count for HTTP downloads stays at 0.
-This results in the engine calculating a NaN progress value many times
-each frame, which results in a significant performance hit.
----
- engine/common/net_ws.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/engine/common/net_ws.c b/engine/common/net_ws.c
-index ef403b3..8b491ba 100644
---- a/engine/common/net_ws.c
-+++ b/engine/common/net_ws.c
-@@ -2280,7 +2280,7 @@ void HTTP_Run( void )
- 	}
- 
- 	// update progress
--	if( !Host_IsDedicated() )
-+	if( !Host_IsDedicated() && iProgressCount != 0 )
- 		Cvar_SetValue( "scr_download", flProgress/iProgressCount * 100 );
- 
- 	HTTP_AutoClean();

Ports/xash3d-fwgs/patches/ReadMe.md

@@ -1,17 +1,7 @@
 # Patches for xash3d-fwgs on SerenityOS
 
-## `0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch`
+## `0001-engine-whereami-Add-SerenityOS.patch`
 
-Build: Add SerenityOS to list of compatible systems
+engine: whereami: Add SerenityOS
 
-This is required by the build system to spit out a library with
-the correct name/platform.
-
-## `0002-Engine-Keep-HTTP-from-endlessly-formatting-NaN-value.patch`
-
-Engine: Keep HTTP from endlessly formatting NaN values
-
-For whatever reason, our progress count for HTTP downloads stays at 0.
-This results in the engine calculating a NaN progress value many times
-each frame, which results in a significant performance hit.