mirror of
https://github.com/SerenityOS/serenity
synced 2024-07-21 18:15:58 +00:00
Ports/opfor: Update to 2022.07.14
This commit is contained in:
Tim Schumacher
Linus Groh
parent
9383ffadb6
commit
028c26df76
|
|
@ -178,7 +178,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
|
|||
| [`openttd-opensfx`](openttd-opensfx/) | OpenSFX audio files for OpenTTD | 1.0.3 | https://www.openttd.org/ |
|
||||
| [`opentyrian`](opentyrian/) | OpenTyrian | 84b820f | https://github.com/opentyrian/opentyrian |
|
||||
| [`opentyrian-data`](opentyrian-data/) | OpenTyrian graphics and audio | 1.0.0 | https://camanis.net/tyrian/tyrian21.zip |
|
||||
| [`opfor`](opfor/) | Half-Life: Opposing Force | 2022.05.01 | https://github.com/FWGS/hlsdk-xash3d |
|
||||
| [`opfor`](opfor/) | Half-Life: Opposing Force | 2022.07.14 | https://github.com/FWGS/hlsdk-portable |
|
||||
| [`optipng`](optipng/) | OptiPNG | 0.7.7 | http://optipng.sourceforge.net/ |
|
||||
| [`p7zip`](p7zip/) | p7zip | 17.04 | https://github.com/jinfeihan57/p7zip |
|
||||
| [`patch`](patch/) | patch (GNU) | 2.7.6 | https://savannah.gnu.org/projects/patch/ |
|
||||
|
|
|
|||
|
|
@ -1,23 +1,21 @@
|
|||
#!/usr/bin/env -S bash ../.port_include.sh
|
||||
port="opfor"
|
||||
version="2022.05.01" # Bogus version, this was the last time the commit hashes were updated.
|
||||
_hlsdk_commit=2ffa0261e30a4b90082965bb2539b767c5686a5f
|
||||
useconfigure="true"
|
||||
depends=("SDL2" "halflife")
|
||||
workdir="hlsdk-xash3d-${_hlsdk_commit}"
|
||||
files="https://github.com/FWGS/hlsdk-xash3d/archive/${_hlsdk_commit}.tar.gz hlsdk-xash3d-${_hlsdk_commit}.tar.gz 3537f0ba3baead72beecfdc011cc17cce2fd2227d9c9797767c32a869c764f66"
|
||||
auth_type="sha256"
|
||||
launcher_name="Half-Life: Opposing Force"
|
||||
launcher_category="Games"
|
||||
port='opfor'
|
||||
version='2022.07.14' # Bogus version, this was the last time the commit hashes were updated.
|
||||
_hlsdk_commit='04eba8e9edb92e500090bcc2b34274a5647283a5'
|
||||
useconfigure='true'
|
||||
depends=("xash3d-fwgs")
|
||||
workdir="hlsdk-portable-${_hlsdk_commit}"
|
||||
files="https://github.com/FWGS/hlsdk-portable/archive/${_hlsdk_commit}.tar.gz hlsdk-portable-${_hlsdk_commit}.tar.gz f1f70ffdce218dba9df0e3676f09ed4714b62c06bb73241a09ce8b3c3158ed01"
|
||||
auth_type='sha256'
|
||||
launcher_name='Half-Life: Opposing Force'
|
||||
launcher_category='Games'
|
||||
launcher_command='sh /home/anon/Games/halflife/opfor.sh'
|
||||
|
||||
# This one is a bit tricky to build, so I'm going a little bit off the script....
|
||||
configure() {
|
||||
# Configure the shared object projects (client and game)
|
||||
run ./waf configure -T release
|
||||
}
|
||||
|
||||
build() {
|
||||
# Build game shared object
|
||||
run ./waf build
|
||||
}
|
||||
|
||||
|
|
@ -51,6 +49,6 @@ cd $scriptdir
|
|||
EOF
|
||||
chmod +x ${SERENITY_INSTALL_ROOT}/home/anon/Games/halflife/opfor.sh
|
||||
|
||||
echo "Please remember to copy the 'gearbox/' folder from your own Half-Life installation"
|
||||
echo "Please remember to copy the 'valve/' and 'gearbox/' folders from your own Half-Life installation"
|
||||
echo "into ${SERENITY_INSTALL_ROOT}/home/anon/Games/halflife/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jesse Buhagiar <jooster669@gmail.com>
|
||||
Date: Sun, 2 Jan 2022 00:10:53 +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.
|
||||
---
|
||||
public/build.h | 4 ++++
|
||||
scripts/waifulib/library_naming.py | 3 +++
|
||||
2 files changed, 7 insertions(+)
|
||||
|
||||
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
|
||||
diff --git a/scripts/waifulib/library_naming.py b/scripts/waifulib/library_naming.py
|
||||
index dd82508..fb46ae6 100644
|
||||
--- a/scripts/waifulib/library_naming.py
|
||||
+++ b/scripts/waifulib/library_naming.py
|
||||
@@ -56,6 +56,7 @@ DEFINES = [
|
||||
'XASH_RISCV_DOUBLEFP',
|
||||
'XASH_RISCV_SINGLEFP',
|
||||
'XASH_RISCV_SOFTFP',
|
||||
+'XASH_SERENITY',
|
||||
'XASH_WIN32',
|
||||
'XASH_WIN64',
|
||||
'XASH_X86',
|
||||
@@ -88,6 +89,8 @@ def configure(conf):
|
||||
buildos = "dos4gw" # unused, just in case
|
||||
elif conf.env.XASH_HAIKU:
|
||||
buildos = "haiku"
|
||||
+ elif conf.env.XASH_SERENITY:
|
||||
+ buildos = "serenityos"
|
||||
else:
|
||||
conf.fatal("Place your operating system name in build.h and library_naming.py!\n"
|
||||
"If this is a mistake, try to fix conditions above and report a bug")
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# Patches for opfor on SerenityOS
|
||||
|
||||
## `0001-Build-Add-SerenityOS-to-list-of-compatible-systems.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.
|
||||
|
||||
Loading…
Reference in a new issue