From 9383ffadb656036e6f6fcbb69d182af01dbbcd68 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Thu, 14 Jul 2022 20:57:02 +0200 Subject: [PATCH] Ports/halflife: Update to 2022.07.14 --- Ports/AvailablePorts.md | 2 +- Ports/halflife/package.sh | 20 +++---- ...nityOS-to-list-of-compatible-systems.patch | 55 ------------------- ...ld-Add-__STRINGS_H_COMPAT_HACK-macro.patch | 24 -------- Ports/halflife/patches/ReadMe.md | 16 ------ 5 files changed, 11 insertions(+), 106 deletions(-) delete mode 100644 Ports/halflife/patches/0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch delete mode 100644 Ports/halflife/patches/0002-Build-Add-__STRINGS_H_COMPAT_HACK-macro.patch delete mode 100644 Ports/halflife/patches/ReadMe.md diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index ca51dbfb76..8359365360 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -84,7 +84,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`gsl`](gsl/) | GNU Scientific Library | 2.7.1 | https://www.gnu.org/software/gsl/ | | [`guile`](guile/) | The GNU guile programming language | 3.0.8 | https://www.gnu.org/software/guile/ | | [`gzip`](gzip/) | GNU gzip | 1.12 | https://www.gnu.org/software/gzip/ | -| [`halflife`](halflife/) | Half-Life | 2022.05.01 | https://github.com/FWGS/xash3d-fwgs | +| [`halflife`](halflife/) | Half-Life | 2022.07.14 | https://github.com/FWGS/hlsdk-portable | | [`harfbuzz`](harfbuzz/) | HarfBuzz | 4.3.0 | https://github.com/harfbuzz/harfbuzz | | [`hatari`](hatari/) | Atari ST/STE/TT/Falcon emulator | 2.4.0-devel | https://hatari.tuxfamily.org/ | | [`imagemagick`](imagemagick/) | ImageMagick | 7.1.0-29 | https://imagemagick.org | diff --git a/Ports/halflife/package.sh b/Ports/halflife/package.sh index fe6460a648..c8f06fd324 100755 --- a/Ports/halflife/package.sh +++ b/Ports/halflife/package.sh @@ -1,15 +1,15 @@ #!/usr/bin/env -S bash ../.port_include.sh -port="halflife" -version="2022.05.01" # Bogus version, this was the last time the commit hashes were updated. -_hlsdk_commit=808be9442f60b4388f68fcef8b2659d0cd6db17b -useconfigure="true" +port='halflife' +version='2022.07.14' # Bogus version, this was the last time the commit hashes were updated. +_hlsdk_commit='5a68ce08bc16c3ad04bd068a501d07b3f540aca7' +useconfigure='true' depends=("xash3d-fwgs") -workdir="hlsdk-xash3d-${_hlsdk_commit}" -files="https://github.com/FWGS/hlsdk-xash3d/archive/${_hlsdk_commit}.tar.gz hlsdk-xash3d-${_hlsdk_commit}.tar.gz fd17436571341bd5e50739f22d84f9857f492637479144d01b1ffc1ead9d776b" -auth_type=sha256 -launcher_name="Half-Life" -launcher_category="Games" -launcher_command="sh /home/anon/Games/halflife/hl.sh" +workdir="hlsdk-portable-${_hlsdk_commit}" +files="https://github.com/FWGS/hlsdk-portable/archive/${_hlsdk_commit}.tar.gz hlsdk-portable-${_hlsdk_commit}.tar.gz 846c47db9271f23a3ec554c7cd2b8f75a382b56357b2447441e8d8cf5675c2b9" +auth_type='sha256' +launcher_name='Half-Life' +launcher_category='Games' +launcher_command='sh /home/anon/Games/halflife/hl.sh' export PKG_CONFIG_PATH="${SERENITY_INSTALL_ROOT}/usr/local/lib/pkgconfig" diff --git a/Ports/halflife/patches/0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch b/Ports/halflife/patches/0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch deleted file mode 100644 index 2d33ffc573..0000000000 --- a/Ports/halflife/patches/0001-Build-Add-SerenityOS-to-list-of-compatible-systems.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jesse Buhagiar -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 3692cf1..5b6bcc3 100644 ---- a/public/build.h -+++ b/public/build.h -@@ -75,6 +75,7 @@ For more information, please refer to - #undef XASH_RISCV_DOUBLEFP - #undef XASH_RISCV_SINGLEFP - #undef XASH_RISCV_SOFTFP -+#undef XASH_SERENITY - #undef XASH_WIN32 - #undef XASH_WIN64 - #undef XASH_X86 -@@ -126,6 +127,9 @@ For more information, please refer to - #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 a392906..44ade2f 100644 ---- a/scripts/waifulib/library_naming.py -+++ b/scripts/waifulib/library_naming.py -@@ -57,6 +57,7 @@ DEFINES = [ - 'XASH_RISCV_DOUBLEFP', - 'XASH_RISCV_SINGLEFP', - 'XASH_RISCV_SOFTFP', -+'XASH_SERENITY', - 'XASH_WIN32', - 'XASH_WIN64', - 'XASH_X86', -@@ -89,6 +90,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") diff --git a/Ports/halflife/patches/0002-Build-Add-__STRINGS_H_COMPAT_HACK-macro.patch b/Ports/halflife/patches/0002-Build-Add-__STRINGS_H_COMPAT_HACK-macro.patch deleted file mode 100644 index 4cd8c7a2f2..0000000000 --- a/Ports/halflife/patches/0002-Build-Add-__STRINGS_H_COMPAT_HACK-macro.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jesse Buhagiar -Date: Sun, 2 Jan 2022 00:27:17 +1100 -Subject: [PATCH] Build: Add `__STRINGS_H_COMPAT_HACK` macro - -This bypasses a bunch of `str[n]cmpcase` errors that occur due to weird -LibC compatibility problems. ---- - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 336e8d3..684c575 100644 ---- a/wscript -+++ b/wscript -@@ -171,7 +171,7 @@ def configure(conf): - elif conf.env.COMPILER_CC == 'owcc': - pass - else: -- conf.env.append_unique('DEFINES', ['stricmp=strcasecmp', 'strnicmp=strncasecmp', '_snprintf=snprintf', '_vsnprintf=vsnprintf', '_LINUX', 'LINUX']) -+ conf.env.append_unique('DEFINES', ['stricmp=strcasecmp', 'strnicmp=strncasecmp', '_snprintf=snprintf', '_vsnprintf=vsnprintf', '_LINUX', 'LINUX', '__STRINGS_H_COMPAT_HACK']) - conf.env.append_unique('CXXFLAGS', ['-Wno-invalid-offsetof', '-fno-rtti', '-fno-exceptions']) - - # strip lib from pattern diff --git a/Ports/halflife/patches/ReadMe.md b/Ports/halflife/patches/ReadMe.md deleted file mode 100644 index 6dc2453924..0000000000 --- a/Ports/halflife/patches/ReadMe.md +++ /dev/null @@ -1,16 +0,0 @@ -# Patches for halflife 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. - -## `0002-Build-Add-__STRINGS_H_COMPAT_HACK-macro.patch` - -Build: Add `__STRINGS_H_COMPAT_HACK` macro - -This bypasses a bunch of `str[n]cmpcase` errors that occur due to weird -LibC compatibility problems. -