From a357537dba8329ba8c723e99ee9c6473d8a54f91 Mon Sep 17 00:00:00 2001 From: Aaditya Aryal Date: Mon, 18 Mar 2024 16:43:59 +0545 Subject: [PATCH] taisei: update to 1.4.1 --- srcpkgs/taisei/patches/msse2.patch | 15 +++++ srcpkgs/taisei/patches/openssl1.patch | 95 --------------------------- srcpkgs/taisei/patches/openssl2.patch | 57 ---------------- srcpkgs/taisei/patches/zstdoom.patch | 42 ++++++++++++ srcpkgs/taisei/template | 10 +-- 5 files changed, 62 insertions(+), 157 deletions(-) create mode 100644 srcpkgs/taisei/patches/msse2.patch delete mode 100644 srcpkgs/taisei/patches/openssl1.patch delete mode 100644 srcpkgs/taisei/patches/openssl2.patch create mode 100644 srcpkgs/taisei/patches/zstdoom.patch diff --git a/srcpkgs/taisei/patches/msse2.patch b/srcpkgs/taisei/patches/msse2.patch new file mode 100644 index 00000000000000..331a698c382d97 --- /dev/null +++ b/srcpkgs/taisei/patches/msse2.patch @@ -0,0 +1,15 @@ +Index: meson.build +=================================================================== +diff --git a/meson.build b/meson.build +index 47336447..b748cba8 100644 +--- a/meson.build ++++ b/meson.build +@@ -179,7 +179,7 @@ taisei_c_args = cc.get_supported_arguments(taisei_c_args) + + foreach arglist : [ + taisei_conversion_c_args, +- ['-msse', '-mfpmath=sse'], ++ ['-msse2', '-mfpmath=sse'], + ] + if cc.has_multi_arguments(arglist) + taisei_c_args += arglist diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch deleted file mode 100644 index 2a804bb7710fb8..00000000000000 --- a/srcpkgs/taisei/patches/openssl1.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/src/util/sha256.c b/src/util/sha256.c -index 15f4491ee..e01e32279 100644 ---- a/src/util/sha256.c -+++ b/src/util/sha256.c -@@ -119,7 +119,7 @@ static void sha256_init(SHA256State *ctx) - ctx->state[7] = 0x5be0cd19; - } - --SHA256State* sha256_new(void) { -+SHA256State *sha256_new(void) { - SHA256State *ctx = calloc(1, sizeof(*ctx)); - sha256_init(ctx); - return ctx; -@@ -129,8 +129,7 @@ void sha256_free(SHA256State *ctx) { - free(ctx); - } - --void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) --{ -+void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) { - sha256_word_t i; - - for (i = 0; i < len; ++i) { -@@ -144,8 +143,7 @@ void sha256_update(SHA256State *ctx, const sha256_byte_t data[], size_t len) - } - } - --void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) --{ -+void sha256_final(SHA256State *ctx, sha256_byte_t hash[], size_t hashlen) { - assert(hashlen >= SHA256_BLOCK_SIZE); - - sha256_word_t i; -@@ -201,8 +199,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI - sha256_final(&ctx, hash, hashlen); - } - --void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) { -- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1); -+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) { -+ assert(hashlen >= SHA256_HEXDIGEST_SIZE); - - uint8_t digest[SHA256_BLOCK_SIZE]; - sha256_digest(data, len, digest, sizeof(digest)); -diff --git a/src/util/sha256.h b/src/util/sha256.h -index 191246c91..f501e2d98 100644 ---- a/src/util/sha256.h -+++ b/src/util/sha256.h -@@ -11,16 +11,19 @@ - - #include "taisei.h" - --#define SHA256_BLOCK_SIZE 32 -+enum { -+ SHA256_BLOCK_SIZE = 32, -+ SHA256_HEXDIGEST_SIZE = SHA256_BLOCK_SIZE * 2 + 1, -+}; - - typedef struct SHA256State SHA256State; - --SHA256State* sha256_new(void) attr_returns_allocated; -+SHA256State *sha256_new(void) attr_returns_allocated; - void sha256_update(SHA256State *state, const uint8_t *data, size_t len) attr_nonnull(1, 2); - void sha256_final(SHA256State *state, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) attr_nonnull(1, 2); - void sha256_free(SHA256State *state); - - void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen); --void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen); -+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen); - - #endif // IGUARD_util_sha256_h -diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c -index b6f8e9039..0dc06e740 100644 ---- a/src/util/sha256_openssl.c -+++ b/src/util/sha256_openssl.c -@@ -17,7 +17,7 @@ struct SHA256State { - SHA256_CTX context; - }; - --SHA256State* sha256_new(void) { -+SHA256State *sha256_new(void) { - SHA256State *st = calloc(1, sizeof(*st)); - SHA256_Init(&st->context); - return st; -@@ -45,8 +45,8 @@ void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SI - SHA256_Final(hash, &ctx); - } - --void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_BLOCK_SIZE*2+1], size_t hashlen) { -- assert(hashlen >= SHA256_BLOCK_SIZE * 2 + 1); -+void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) { -+ assert(hashlen >= SHA256_HEXDIGEST_SIZE); - - uint8_t digest[SHA256_BLOCK_SIZE]; - sha256_digest(data, len, digest, sizeof(digest)); diff --git a/srcpkgs/taisei/patches/openssl2.patch b/srcpkgs/taisei/patches/openssl2.patch deleted file mode 100644 index c1b9f411badc6a..00000000000000 --- a/srcpkgs/taisei/patches/openssl2.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/util/sha256_openssl.c b/src/util/sha256_openssl.c -index 0dc06e740..c73d8e7fb 100644 ---- a/src/util/sha256_openssl.c -+++ b/src/util/sha256_openssl.c -@@ -11,38 +11,34 @@ - #include "sha256.h" - #include "util.h" - --#include -- --struct SHA256State { -- SHA256_CTX context; --}; -+#include - - SHA256State *sha256_new(void) { -- SHA256State *st = calloc(1, sizeof(*st)); -- SHA256_Init(&st->context); -- return st; -+ EVP_MD_CTX *ctx = EVP_MD_CTX_new(); -+ EVP_DigestInit(ctx, EVP_sha256()); -+ return (SHA256State*)ctx; - } - --void sha256_free(SHA256State *ctx) { -- free(ctx); -+void sha256_free(SHA256State *st) { -+ EVP_MD_CTX_free((EVP_MD_CTX*)st); - } - --void sha256_update(SHA256State *ctx, const uint8_t *data, size_t len) { -- SHA256_Update(&ctx->context, data, len); -+void sha256_update(SHA256State *st, const uint8_t *data, size_t len) { -+ EVP_DigestUpdate((EVP_MD_CTX*)st, data, len); - } - --void sha256_final(SHA256State *ctx, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) { -+void sha256_final(SHA256State *st, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) { - assert(hashlen >= SHA256_BLOCK_SIZE); -- SHA256_Final(hash, &ctx->context); -+ EVP_DigestFinalXOF((EVP_MD_CTX*)st, hash, hashlen); - } - - void sha256_digest(const uint8_t *data, size_t len, uint8_t hash[SHA256_BLOCK_SIZE], size_t hashlen) { - assert(hashlen >= SHA256_BLOCK_SIZE); - -- SHA256_CTX ctx; -- SHA256_Init(&ctx); -- SHA256_Update(&ctx, data, len); -- SHA256_Final(hash, &ctx); -+ SHA256State *st = sha256_new(); -+ sha256_update(st, data, len); -+ sha256_final(st, hash, hashlen); -+ sha256_free(st); - } - - void sha256_hexdigest(const uint8_t *data, size_t len, char hash[SHA256_HEXDIGEST_SIZE], size_t hashlen) { diff --git a/srcpkgs/taisei/patches/zstdoom.patch b/srcpkgs/taisei/patches/zstdoom.patch new file mode 100644 index 00000000000000..ede7c3af23d47e --- /dev/null +++ b/srcpkgs/taisei/patches/zstdoom.patch @@ -0,0 +1,42 @@ +diff --git a/scripts/meson.build b/scripts/meson.build +index 7429e673..4aa23144 100644 +--- a/scripts/meson.build ++++ b/scripts/meson.build +@@ -114,7 +114,11 @@ upkeep_command = [upkeep_script, common_taiseilib_args] + upkeep_target = run_target('upkeep', command: upkeep_command) + + pack_script = find_program(files('pack.py')) +-pack_command = [pack_script, common_taiseilib_args] ++if build_machine.cpu() == 'i686' ++ pack_command = [pack_script, '--monkey_patch_i686', common_taiseilib_args] ++else ++ pack_command = [pack_script, common_taiseilib_args] ++endif + + glob_script = find_program(files('glob-search.py')) + glob_command = [glob_script] +diff --git a/scripts/pack.py b/scripts/pack.py +index 913e5a66..a8fae993 100755 +--- a/scripts/pack.py ++++ b/scripts/pack.py +@@ -104,7 +104,7 @@ def log_file(path, arcname, comp_type=None): + def pack(args): + nocompress_file = args.directory / '.nocompress' + +- if 1: ++ if args.monkey_patch_i686 == False: + comp_type = ZIP_ZSTANDARD + comp_level = 20 + else: +@@ -181,6 +181,11 @@ def main(args): + + add_common_args(parser, depfile=True) + ++ parser.add_argument('--monkey_patch_i686', ++ action='store_true', ++ default=False, ++ ) ++ + args = parser.parse_args(args[1:]) + pack(args) + diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template index 52d2834a7166fe..92574bcbe31106 100644 --- a/srcpkgs/taisei/template +++ b/srcpkgs/taisei/template @@ -1,9 +1,9 @@ # Template file for 'taisei' pkgname=taisei -version=1.3.2 -revision=2 +version=1.4.1 +revision=1 build_style=meson -hostmakedepends="pkg-config python3-docutils" +hostmakedepends="pkg-config python3-docutils python3-zstandard" makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel" depends="${pkgname}-data" @@ -11,8 +11,8 @@ short_desc="Free and open-source Touhou Project clone and fangame" maintainer="SolitudeSF " license="MIT" homepage="https://taisei-project.org" -distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-v${version}.tar.xz" -checksum=dbc05f1b5c31981d8711130ac283355b7bfad403895f4096a6bb7e9a3d73a3bc +distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz" +checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01 post_install() { vlicense COPYING