system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 10:36:24 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports: Return opfor to upstream

Browse source
This commit is contained in:
Tim Schumacher 2022-03-24 16:12:12 +01:00 committed by Linus Groh
parent c9c59602a4
commit 73e505fb77
4 changed files with 67 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -160,7 +160,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`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 | 1.0.0 | https://github.com/SerenityPorts/xash3d-fwgs |
| [`opfor`](opfor/) | Half-Life: Opposing Force | 2022.05.01 | https://github.com/FWGS/hlsdk-xash3d |
| [`oksh`](oksh/) | oksh | 7.0 | https://github.com/ibara/oksh |
| [`p7zip`](p7zip/) | p7zip | 17.04 | https://github.com/jinfeihan57/p7zip |
| [`patch`](patch/) | patch (GNU) | 2.7.6 | https://savannah.gnu.org/projects/patch/ |

8
Ports/opfor/package.sh
View file

@ -1,10 +1,12 @@
#!/usr/bin/env -S bash ../.port_include.sh
port="opfor"
version="1.0.0"
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-opfor"
files="https://github.com/SerenityPorts/hlsdk-xash3d/archive/opfor.tar.gz xash3d_gearbox.tar.gz"
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"

6
Ports/opfor/patches/ReadMe.md Normal file
View file

@ -0,0 +1,6 @@
# Patches for opfor
## `hlsdk-add-serenity.patch`
Add SerenityOS to the supported architectures of hlsdk.

55
Ports/opfor/patches/hlsdk-add-serenity.patch Normal file
View file

@ -0,0 +1,55 @@
From 77ad240d87d86e57d0666d45ea6d7b9127d6924b 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 6e1f326d6..57a7735f4 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 dd8250880..fb46ae604 100644
--- a/scripts/waifulib/library_naming.py
+++ b/scripts/waifulib/library_naming.py
@@ -56,6 +56,7 @@
'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")