From b34e2854109a67501ba8e6d24c9363a301400ccc Mon Sep 17 00:00:00 2001 From: SolitudeSF Date: Fri, 8 Sep 2023 09:53:56 +0300 Subject: [PATCH] taisei: update to 1.4 --- srcpkgs/taisei/patches/openssl1.patch | 95 --------------------------- srcpkgs/taisei/patches/openssl2.patch | 57 ---------------- srcpkgs/taisei/template | 10 +-- 3 files changed, 5 insertions(+), 157 deletions(-) delete mode 100644 srcpkgs/taisei/patches/openssl1.patch delete mode 100644 srcpkgs/taisei/patches/openssl2.patch diff --git a/srcpkgs/taisei/patches/openssl1.patch b/srcpkgs/taisei/patches/openssl1.patch deleted file mode 100644 index 2a804bb7710fb..0000000000000 --- 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 c1b9f411badc6..0000000000000 --- 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/template b/srcpkgs/taisei/template index 52d2834a7166f..42a4b57a47b57 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 +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=cc025ad73246790e1a53978c4612b3aaffc0d3acfbfd181a39e6fbd853ca99be post_install() { vlicense COPYING