mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-21 18:15:58 +00:00
Ports/xash3d-fwgs: Update to 2022.07.14
This commit is contained in:
Tim Schumacher
Linus Groh
parent
4cf55c4056
commit
cdb59ec82a
|
|
@ -249,7 +249,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`wireguard-tools`](wireguard-tools/) | WireGuard Tools | 1.0.20210914 | https://www.wireguard.com/ |
|
||||
| [`x264`](x264/) | x264 | baee400 | https://www.videolan.org/developers/x264.html |
|
||||
| [`x265`](x265/) | x265 | 3.5 | https://bitbucket.org/multicoreware/x265_git/wiki/Home |
|
||||
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.05.01 | https://github.com/FWGS/xash3d-fwgs |
|
||||
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.07.14 | https://github.com/FWGS/xash3d-fwgs |
|
||||
| [`xz`](xz/) | xz | 5.2.5 | https://tukaani.org/xz/ |
|
||||
| [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ |
|
||||
| [`zlib`](zlib/) | zlib | 1.2.12 | https://www.zlib.net/ |
|
||||
|
|
|
|||
|
|
@ -1,18 +1,20 @@
|
|||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port="xash3d-fwgs"
|
||||
version="2022.05.01" # Bogus version, this was the last time the commit hashes were updated.
|
||||
_fwgs_commit=5402e1a2597c40c603bd0f2b1a9cd6a16506ec84
|
||||
_vgui_commit=93573075afe885618ea15831e72d44bdacd65bfb
|
||||
_mainui_commit=01e964fdc26f5dce1512c030d0dfd68e17be2858
|
||||
_miniutl_commit=67c8c226c451f32ee3c98b94e04f8966092b70d3
|
||||
useconfigure="true"
|
||||
port='xash3d-fwgs'
|
||||
version='2022.07.14' # Bogus version, this was the last time the commit hashes were updated.
|
||||
_fwgs_commit='772f4dcb60a8a2594df40195af4a0d4bd8ea7863'
|
||||
_vgui_dev_commit='93573075afe885618ea15831e72d44bdacd65bfb'
|
||||
_vgui_support_commit='991085982209a1b8eefabae04d842004d4f4fe4f'
|
||||
_mainui_commit='97fcbf8979f22d774b1cc01cb5553743592d39d0'
|
||||
_miniutl_commit='67c8c226c451f32ee3c98b94e04f8966092b70d3'
|
||||
useconfigure='true'
|
||||
depends=("SDL2" "fontconfig" "freetype")
|
||||
workdir="xash3d-fwgs-${_fwgs_commit}"
|
||||
files="https://github.com/FWGS/xash3d-fwgs/archive/${_fwgs_commit}.tar.gz xash3d-fwgs-${_fwgs_commit}.tar.gz 1401f6c0cf619c48a8a40938b2acdffd327725ca0ab59804c518bddf821637f9
|
||||
https://github.com/FWGS/vgui-dev/archive/${_vgui_commit}.tar.gz vgui-dev-${_vgui_commit}.tar.gz eb9315fba8ae444fdae240c10afebaf7f3b157233bf1589f0af557b2286928fa
|
||||
https://github.com/FWGS/mainui_cpp/archive/${_mainui_commit}.tar.gz mainui_cpp-${_mainui_commit}.tar.gz c8f6ce81596d5690044542074ac9bc69bbd43b5e5766f71363a8b5d4d382ad71
|
||||
files="https://github.com/FWGS/xash3d-fwgs/archive/${_fwgs_commit}.tar.gz xash3d-fwgs-${_fwgs_commit}.tar.gz 0840c08f107c63bd54f75ccb49ce338c2b1c9532adbab833dd53a56ff896432b
|
||||
https://github.com/FWGS/vgui_support/archive/${_vgui_support_commit}.tar.gz vgui_support-${_vgui_support_commit}.tar.gz 68ac969310faea7b47d78f114039a78f3ee79909365cb998b57cc717c51bb871
|
||||
https://github.com/FWGS/vgui-dev/archive/${_vgui_dev_commit}.tar.gz vgui-dev-${_vgui_dev_commit}.tar.gz eb9315fba8ae444fdae240c10afebaf7f3b157233bf1589f0af557b2286928fa
|
||||
https://github.com/FWGS/mainui_cpp/archive/${_mainui_commit}.tar.gz mainui_cpp-${_mainui_commit}.tar.gz 9b8b469c8f0e23f6f62da91234517caf18b944217284d4eb8a506b5462460222
|
||||
https://github.com/FWGS/MiniUTL/archive/${_miniutl_commit}.tar.gz MiniUTL-${_miniutl_commit}.tar.gz 7b7b26377854b3fc741c8d652d8b3c9c540512644943ca6efb63df941b2861e3"
|
||||
auth_type=sha256
|
||||
auth_type='sha256'
|
||||
|
||||
export PKG_CONFIG_PATH="${SERENITY_INSTALL_ROOT}/usr/local/lib/pkgconfig"
|
||||
|
||||
|
|
@ -25,11 +27,16 @@ pre_patch() {
|
|||
rmdir mainui/miniutl
|
||||
cp -r ../MiniUTL-${_miniutl_commit}/ mainui/miniutl
|
||||
|
||||
rm -rf vgui_support
|
||||
cp -r ../vgui_support-${_vgui_support_commit}/ vgui_support
|
||||
rm -rf vgui_support/vgui-dev
|
||||
cp -r ../vgui-dev-${_vgui_dev_commit}/ vgui_support/vgui-dev
|
||||
|
||||
popd
|
||||
}
|
||||
|
||||
configure() {
|
||||
run ./waf configure --sdl2="${SERENITY_INSTALL_ROOT}/usr/local" --vgui=../vgui-dev-${_vgui_commit}/ -T release
|
||||
run ./waf configure --sdl2="${SERENITY_INSTALL_ROOT}/usr/local" -T release
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
|
@ -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();
|
||||
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue