* [PR PATCH] taisei 1.4.1 version bump
@ 2024-03-18 11:00 aryalaadi
2024-03-25 16:35 ` [PR PATCH] [Updated] " aryalaadi
` (55 more replies)
0 siblings, 56 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-18 11:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei 1.4.1 version bump
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 7498 bytes --]
From 5cd236d25ba0076502b1fffc097bf42467a60005 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei 1.4.1 version bump
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 8 +--
3 files changed, 4 insertions(+), 156 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..09652556cbe219 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
+version=1.4.1
revision=2
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 <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei 1.4.1 version bump
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
@ 2024-03-25 16:35 ` aryalaadi
2024-03-25 16:51 ` aryalaadi
` (54 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-25 16:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei 1.4.1 version bump
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 8828 bytes --]
From 5cd236d25ba0076502b1fffc097bf42467a60005 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH 1/2] taisei 1.4.1 version bump
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 8 +--
3 files changed, 4 insertions(+), 156 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..09652556cbe219 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
+version=1.4.1
revision=2
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 <solitudesf@protonmail.com>"
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
From 3874fe76de28c3823c2d7626ce6dcdfc42147fe2 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 25 Mar 2024 22:19:27 +0545
Subject: [PATCH 2/2] lint issues
---
srcpkgs/taisei/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 09652556cbe219..1991e370400b9f 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,17 @@
# Template file for 'taisei'
pkgname=taisei
version=1.4.1
-revision=2
+revision=1
build_style=meson
hostmakedepends="pkg-config python3-docutils python3-zstandard"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://taisei-project.org"
distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
-checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01
+checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01
post_install() {
vlicense COPYING
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei 1.4.1 version bump
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
2024-03-25 16:35 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-25 16:51 ` aryalaadi
2024-03-25 16:55 ` [PR REVIEW] taisei: update to 1.4.1 tornaria
` (53 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-25 16:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei 1.4.1 version bump
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9548 bytes --]
From 5cd236d25ba0076502b1fffc097bf42467a60005 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH 1/3] taisei 1.4.1 version bump
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 8 +--
3 files changed, 4 insertions(+), 156 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..09652556cbe219 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,9 +1,9 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
+version=1.4.1
revision=2
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 <solitudesf@protonmail.com>"
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
From 3874fe76de28c3823c2d7626ce6dcdfc42147fe2 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 25 Mar 2024 22:19:27 +0545
Subject: [PATCH 2/3] lint issues
---
srcpkgs/taisei/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 09652556cbe219..1991e370400b9f 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,17 @@
# Template file for 'taisei'
pkgname=taisei
version=1.4.1
-revision=2
+revision=1
build_style=meson
hostmakedepends="pkg-config python3-docutils python3-zstandard"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://taisei-project.org"
distfiles="https://github.com/taisei-project/taisei/releases/download/v${version}/taisei-${version}.tar.xz"
-checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01
+checksum=98a4fcea296e7bd3ef21c23adf065500ee5e41cbc66e6cf611168a20cd539a01
post_install() {
vlicense COPYING
From 1ad3e241ee24f1ff344d9135a140c889c22261d7 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 25 Mar 2024 22:35:16 +0545
Subject: [PATCH 3/3] short_desc
---
srcpkgs/taisei/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 1991e370400b9f..f11019fe561713 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -2,6 +2,7 @@
pkgname=taisei
version=1.4.1
revision=1
+short_desc="A free and open-source Touhou Project fangame"
build_style=meson
hostmakedepends="pkg-config python3-docutils python3-zstandard"
makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
2024-03-25 16:35 ` [PR PATCH] [Updated] " aryalaadi
2024-03-25 16:51 ` aryalaadi
@ 2024-03-25 16:55 ` tornaria
2024-03-25 16:56 ` tornaria
` (52 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-25 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1537918622
Comment:
```suggestion
short_desc="Free and open-source Touhou Project fangame"
```
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (2 preceding siblings ...)
2024-03-25 16:55 ` [PR REVIEW] taisei: update to 1.4.1 tornaria
@ 2024-03-25 16:56 ` tornaria
2024-03-25 17:00 ` [PR PATCH] [Updated] " aryalaadi
` (51 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-25 16:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1537918622
Comment:
```suggestion
```
Leave just the short_desc below.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (3 preceding siblings ...)
2024-03-25 16:56 ` tornaria
@ 2024-03-25 17:00 ` aryalaadi
2024-03-25 17:04 ` aryalaadi
` (50 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-25 17:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 7666 bytes --]
From 6ac619f4de6889ac6f8c9fd44649e94100d9ac86 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
bump taisei version
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 14 ++--
3 files changed, 7 insertions(+), 159 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..f11019fe561713 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# Template file for 'taisei'
pkgname=taisei
-version=1.3.2
-revision=2
+version=1.4.1
+revision=1
+short_desc="A free and open-source Touhou Project fangame"
build_style=meson
-hostmakedepends="pkg-config python3-docutils"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (4 preceding siblings ...)
2024-03-25 17:00 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-25 17:04 ` aryalaadi
2024-03-25 17:16 ` aryalaadi
` (49 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-25 17:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 7606 bytes --]
From 6c2d90b7d91452223fbf29dcb3e3de361225fe49 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
bump taisei version
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 13 ++--
3 files changed, 6 insertions(+), 159 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..1991e370400b9f 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,17 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (5 preceding siblings ...)
2024-03-25 17:04 ` aryalaadi
@ 2024-03-25 17:16 ` aryalaadi
2024-03-26 14:07 ` [PR REVIEW] " tornaria
` (48 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-25 17:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 7586 bytes --]
From 37fc6045a6cc7972ec31e9742297ca34cac07d05 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/template | 13 ++--
3 files changed, 6 insertions(+), 159 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 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 52d2834a7166fe..1991e370400b9f 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,17 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (6 preceding siblings ...)
2024-03-25 17:16 ` aryalaadi
@ 2024-03-26 14:07 ` tornaria
2024-03-26 16:17 ` [PR PATCH] [Updated] " aryalaadi
` (47 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-26 14:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1539312160
Comment:
Did you actually change anything here? I would just leave it as is (also the new version goes over 80 colums)
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (7 preceding siblings ...)
2024-03-26 14:07 ` [PR REVIEW] " tornaria
@ 2024-03-26 16:17 ` aryalaadi
2024-03-26 16:29 ` tornaria
` (46 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-26 16:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9989 bytes --]
From a357537dba8329ba8c723e99ee9c6473d8a54f91 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (8 preceding siblings ...)
2024-03-26 16:17 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-26 16:29 ` tornaria
2024-03-26 23:54 ` ahesford
` (45 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-26 16:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2020915440
Comment:
Great! Could you submit your patches as PR to upstream?
@ahesford: this LGTM now
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (9 preceding siblings ...)
2024-03-26 16:29 ` tornaria
@ 2024-03-26 23:54 ` ahesford
2024-03-27 3:38 ` tornaria
` (44 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-03-26 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2021670481
Comment:
What motivates the switch to SSE2 contrary to upstream's specification?
Please add an explanation to the top of the zstdoom patch about why it's necessary. Also, because it would be best to send this patch upstream, you might consider a more descriptive argument like `--disable-zstd` instead of `--monkey_patch_i686`.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (10 preceding siblings ...)
2024-03-26 23:54 ` ahesford
@ 2024-03-27 3:38 ` tornaria
2024-03-27 3:54 ` [PR PATCH] [Updated] " aryalaadi
` (43 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-27 3:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2021864629
Comment:
> What motivates the switch to SSE2 contrary to upstream's specification?
I suggested it, since `cglm` uses sse2 intrinsics and makes no attempt at being compatible with sse. Note that x86_64 includes sse2 by definition, which is why `-msse` and `-msse2` make no difference at all on 64 bits.
It's been discussed before that using sse2 is ok-ish for i686. We try to avoid it for core packages so the distro still has a chance of running in 25 year old cpus.
> Please add an explanation to the top of the zstdoom patch about why it's necessary. Also, because it would be best to send this patch upstream, you might consider a more descriptive argument like `--disable-zstd` instead of `--monkey_patch_i686`.
This makes sense. As a matter of fact, I was thinking of just checking if arch is i686 directly in the python script rather than in meson.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (11 preceding siblings ...)
2024-03-27 3:38 ` tornaria
@ 2024-03-27 3:54 ` aryalaadi
2024-03-27 3:56 ` aryalaadi
` (42 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 3:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 12105 bytes --]
From a357537dba8329ba8c723e99ee9c6473d8a54f91 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH 1/2] 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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 <solitudesf@protonmail.com>"
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
From f57a3960de25ac58d35019e8d4227963abca47e6 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Wed, 27 Mar 2024 09:38:37 +0545
Subject: [PATCH 2/2] descriptive names
---
srcpkgs/taisei/patches/zstdoom.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/taisei/patches/zstdoom.patch b/srcpkgs/taisei/patches/zstdoom.patch
index ede7c3af23d47e..e34d5df3c8966a 100644
--- a/srcpkgs/taisei/patches/zstdoom.patch
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -1,5 +1,5 @@
diff --git a/scripts/meson.build b/scripts/meson.build
-index 7429e673..4aa23144 100644
+index 7429e673..6a447070 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -114,7 +114,11 @@ upkeep_command = [upkeep_script, common_taiseilib_args]
@@ -8,7 +8,7 @@ index 7429e673..4aa23144 100644
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]
++ pack_command = [pack_script, '--disable-zstandard', common_taiseilib_args]
+else
+ pack_command = [pack_script, common_taiseilib_args]
+endif
@@ -16,7 +16,7 @@ index 7429e673..4aa23144 100644
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
+index 913e5a66..95b9cb00 100755
--- a/scripts/pack.py
+++ b/scripts/pack.py
@@ -104,7 +104,7 @@ def log_file(path, arcname, comp_type=None):
@@ -24,7 +24,7 @@ index 913e5a66..a8fae993 100755
nocompress_file = args.directory / '.nocompress'
- if 1:
-+ if args.monkey_patch_i686 == False:
++ if args.disable_zstandard == False:
comp_type = ZIP_ZSTANDARD
comp_level = 20
else:
@@ -32,7 +32,7 @@ index 913e5a66..a8fae993 100755
add_common_args(parser, depfile=True)
-+ parser.add_argument('--monkey_patch_i686',
++ parser.add_argument('--disable_zstandard',
+ action='store_true',
+ default=False,
+ )
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (12 preceding siblings ...)
2024-03-27 3:54 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-27 3:56 ` aryalaadi
2024-03-27 3:57 ` [PR PATCH] [Updated] " aryalaadi
` (41 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 3:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2021877348
Comment:
> This makes sense. As a matter of fact, I was thinking of just checking if arch is i686 directly in the python script rather than in meson.
how is the python script supposed to know target arch
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (13 preceding siblings ...)
2024-03-27 3:56 ` aryalaadi
@ 2024-03-27 3:57 ` aryalaadi
2024-03-27 4:27 ` aryalaadi
` (40 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9989 bytes --]
From 8e1976daa29c2e83cbc16c84f567ceb7e3f96e57 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..e34d5df3c8966a
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,42 @@
+diff --git a/scripts/meson.build b/scripts/meson.build
+index 7429e673..6a447070 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, '--disable-zstandard', 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..95b9cb00 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.disable_zstandard == 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('--disable_zstandard',
++ 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 <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (14 preceding siblings ...)
2024-03-27 3:57 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-27 4:27 ` aryalaadi
2024-03-27 4:32 ` aryalaadi
` (39 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10398 bytes --]
From 6fecac169d557430d23d84f69d78721f97728cbb Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the x86 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to disable zip standard and make sure i686 build does not fail.
---
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..69323e66e837b0
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,42 @@
+diff --git a/scripts/meson.build b/scripts/meson.build
+index 7429e673..6a447070 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, '--disable_zstandard', 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..95b9cb00 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.disable_zstandard == 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('--disable_zstandard',
++ 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 <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (15 preceding siblings ...)
2024-03-27 4:27 ` aryalaadi
@ 2024-03-27 4:32 ` aryalaadi
2024-03-27 11:01 ` [PR REVIEW] " tornaria
` (38 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 4:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 297 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2021908177
Comment:
> Also, because it would be best to send this patch upstream
sure, but before that I will look into cglm and zstandard to see if I fix the root issue
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (16 preceding siblings ...)
2024-03-27 4:32 ` aryalaadi
@ 2024-03-27 11:01 ` tornaria
2024-03-27 11:10 ` tornaria
` (37 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-27 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1540890157
Comment:
```suggestion
+ # zstd runs out of memory on 32 bit
+ if sys.maxsize > 2**32:
```
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (17 preceding siblings ...)
2024-03-27 11:01 ` [PR REVIEW] " tornaria
@ 2024-03-27 11:10 ` tornaria
2024-03-27 11:24 ` ahesford
` (36 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-27 11:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1540905299
Comment:
this is one way, although the CI seems to indicate the issue is only with i686 and not about 32 bit, as armv6l / armv7l build fine.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (18 preceding siblings ...)
2024-03-27 11:10 ` tornaria
@ 2024-03-27 11:24 ` ahesford
2024-03-27 11:24 ` ahesford
` (35 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-03-27 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1540924172
Comment:
The explanation shouldn't come as a comment in the patched program, but exposition at the top of the patch file to explain why we need the patch. For example:
> Using zstd compression fails on i686, so add and use an option to fall back to DEFLATE for that architecture.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (19 preceding siblings ...)
2024-03-27 11:24 ` ahesford
@ 2024-03-27 11:24 ` ahesford
2024-03-27 11:30 ` ahesford
` (34 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-03-27 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1540923277
Comment:
This is the default behavior with `store_true`.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (20 preceding siblings ...)
2024-03-27 11:24 ` ahesford
@ 2024-03-27 11:30 ` ahesford
2024-03-27 13:05 ` [PR REVIEW] " Akaricchi
` (33 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-03-27 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022545661
Comment:
> I suggested it, since `cglm` uses sse2 intrinsics and makes no attempt at being compatible with sse. Note that x86_64 includes sse2 by definition, which is why `-msse` and `-msse2` make no difference at all on 64 bits.
>
> It's been discussed before that using sse2 is ok-ish for i686. We try to avoid it for core packages so the distro still has a chance of running in 25 year old cpus.
It seems OK to enable SSE2 if it fixes the build for i686. This should definitely be submitted upstream in case they know of some issue we don't, but we can carry the patch in the meantime.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (21 preceding siblings ...)
2024-03-27 11:30 ` ahesford
@ 2024-03-27 13:05 ` Akaricchi
2024-03-27 13:29 ` Akaricchi
` (32 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 13:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1541071890
Comment:
Taisei does not need SDL2_mixer since v1.4. Also missing here are libpng and zlib.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (22 preceding siblings ...)
2024-03-27 13:05 ` [PR REVIEW] " Akaricchi
@ 2024-03-27 13:29 ` Akaricchi
2024-03-27 13:29 ` Akaricchi
` (31 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1154 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022773504
Comment:
`-msse2` is ok, but the proper fix be to correct this check in CGLM: https://github.com/recp/cglm/blob/1de373a9bd453d1fff6846db3a01ade8270f12bb/include/cglm/simd/intrin.h#L27
It should only check for SSE2 there. I can try to submit that upstream a bit later, though I'll need to set up a 32-bit environment to test it first.
For what it's worth, openSUSE doesn't build Taisei for i686, because CGLM fails (or at least used to fail) some unit tests on that platform. It doesn't look like i686 support is well maintained there, and we neither test nor provide i686 Linux builds of Taisei either. I don't believe there's an x86 system around that can handle this game acceptably well while not supporting x86-64.
As for why we enforce `-msse`: what we really want is `-mfpmath=sse`, which prevents the compiler from using x87 FPU instructions for floating point math. It's to reduce the potential for replay compatibility problems between different builds, due to the extended used by those instructions.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (23 preceding siblings ...)
2024-03-27 13:29 ` Akaricchi
@ 2024-03-27 13:29 ` Akaricchi
2024-03-27 13:30 ` Akaricchi
` (30 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022773504
Comment:
`-msse2` is ok, but the proper fix would be to correct this check in CGLM: https://github.com/recp/cglm/blob/1de373a9bd453d1fff6846db3a01ade8270f12bb/include/cglm/simd/intrin.h#L27
It should only check for SSE2 there. I can try to submit that upstream a bit later, though I'll need to set up a 32-bit environment to test it first.
For what it's worth, openSUSE doesn't build Taisei for i686, because CGLM fails (or at least used to fail) some unit tests on that platform. It doesn't look like i686 support is well maintained there, and we neither test nor provide i686 Linux builds of Taisei either. I don't believe there's an x86 system around that can handle this game acceptably well while not supporting x86-64.
As for why we enforce `-msse`: what we really want is `-mfpmath=sse`, which prevents the compiler from using x87 FPU instructions for floating point math. It's to reduce the potential for replay compatibility problems between different builds, due to the extended used by those instructions.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (24 preceding siblings ...)
2024-03-27 13:29 ` Akaricchi
@ 2024-03-27 13:30 ` Akaricchi
2024-03-27 14:24 ` tornaria
` (29 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 13:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022773504
Comment:
`-msse2` is ok, but the proper fix would be to correct this check in CGLM: https://github.com/recp/cglm/blob/1de373a9bd453d1fff6846db3a01ade8270f12bb/include/cglm/simd/intrin.h#L27
It should only check for SSE2 there. I can try to submit that upstream a bit later, though I'll need to set up a 32-bit environment to test it first.
For what it's worth, openSUSE doesn't build Taisei for i686, because CGLM fails (or at least used to fail) some unit tests on that platform. It doesn't look like i686 support is well maintained there, and we neither test nor provide i686 Linux builds of Taisei either. I don't believe there's an x86 system around that can handle this game acceptably well while not supporting x86-64.
As for why we enforce `-msse`: what we really want is `-mfpmath=sse`, which prevents the compiler from using x87 FPU instructions for floating point math. It's to reduce the potential for replay compatibility problems between different builds, due to the extended precision used by those instructions.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (25 preceding siblings ...)
2024-03-27 13:30 ` Akaricchi
@ 2024-03-27 14:24 ` tornaria
2024-03-27 14:49 ` [PR PATCH] [Updated] " aryalaadi
` (28 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-27 14:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022901998
Comment:
> `-msse2` is ok, but the proper fix would be to correct this check in CGLM: https://github.com/recp/cglm/blob/1de373a9bd453d1fff6846db3a01ade8270f12bb/include/cglm/simd/intrin.h#L27
>
> It should only check for SSE2 there. I can try to submit that upstream a bit later, though I'll need to set up a 32-bit environment to test it first.
An easy way is to check out this branch, then do
```
./xbps-src -A i686 binary-bootstrap
./xbps-src -A i686 pkg cglm
./xbps-src -A i686 pkg taisei
```
You can put patches in `srcpkgs/cglm/patches/*.patch` before the `pkg cglm` step.
> For what it's worth, openSUSE doesn't build Taisei for i686, because CGLM fails (or at least used to fail) some unit tests on that platform. It doesn't look like i686 support is well maintained there, and we neither test nor provide i686 Linux builds of Taisei either. I don't believe there's an x86 system around that can handle this game acceptably well while not supporting x86-64.
Isn't that a good reason to build with sse2 by default?
> As for why we enforce `-msse`: what we really want is `-mfpmath=sse`, which prevents the compiler from using x87 FPU instructions for floating point math. It's to reduce the potential for replay compatibility problems between different builds, due to the extended precision used by those instructions.
You can achieve a similar result without sse using `-ffloat-store` (at a cost).
BTW, do you really need level=20 for zstd? That's supposed to use a lot of memory. Maybe 19 is good enough (or you could use something like `20 if sys.maxsize > 2**32 else 19`).
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (26 preceding siblings ...)
2024-03-27 14:24 ` tornaria
@ 2024-03-27 14:49 ` aryalaadi
2024-03-27 14:51 ` aryalaadi
` (27 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10499 bytes --]
From 0721e12065a80e2f4aee59a602d3ff3c741b0a20 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the x86 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to disable zip standard and make sure i686 build does not fail.
---
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 | 14 ++--
5 files changed, 64 insertions(+), 159 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..69323e66e837b0
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,42 @@
+diff --git a/scripts/meson.build b/scripts/meson.build
+index 7429e673..6a447070 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, '--disable_zstandard', 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..95b9cb00 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.disable_zstandard == 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('--disable_zstandard',
++ 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..610135edc21601 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (27 preceding siblings ...)
2024-03-27 14:49 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-27 14:51 ` aryalaadi
2024-03-27 14:57 ` aryalaadi
` (26 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 14:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10498 bytes --]
From 5c54c743279ffadce4563f33674148df834295d6 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the x86 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to disable zip standard and make sure i686 build does not fail.
---
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 | 14 ++--
5 files changed, 64 insertions(+), 159 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..69323e66e837b0
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,42 @@
+diff --git a/scripts/meson.build b/scripts/meson.build
+index 7429e673..6a447070 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, '--disable_zstandard', 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..95b9cb00 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.disable_zstandard == 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('--disable_zstandard',
++ 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..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (28 preceding siblings ...)
2024-03-27 14:51 ` aryalaadi
@ 2024-03-27 14:57 ` aryalaadi
2024-03-27 16:01 ` Akaricchi
` (25 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-27 14:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2022990996
Comment:
musl builds failing now...
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (29 preceding siblings ...)
2024-03-27 14:57 ` aryalaadi
@ 2024-03-27 16:01 ` Akaricchi
2024-03-27 16:07 ` Akaricchi
` (24 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2301 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2023140980
Comment:
> An easy way is to check out this branch, then do
I'm not a Void user, so I think I'll just set up the i686 version of Void in a container for testing.
> Isn't that a good reason to build with sse2 by default?
I don't mind bumping it up to `-msse2` upstream. I only went with `-msse` by default because that's the minimum requirement for `-mfpmath=sse`, and I was somewhat more conservative about i686 support back then.
> You can achieve a similar result without sse using -ffloat-store (at a cost).
Not really. `-ffloat-store` only prevents individual variables from being stored in registers. It won't break up calculations in expressions, e.g. `float x = a * b / (c - d);` the whole thing will be computed in extended precision unless you move every calculation into a separate variable, which is not acceptable for Taisei. Even then, a calculation performed at 80-bit precision truncated to 64 bits may still have a slightly different result. Not to mention the overhead introduced by placing every single float variable into RAM.
> BTW, do you really need level=20 for zstd? That's supposed to use a lot of memory. Maybe 19 is good enough (or you could use something like 20 if sys.maxsize > 2**32 else 19).
The script definitely wasn't written with limited memory/address space in mind. I'll try 19 on i686 and see if it helps.
There's an alternative solution though: you could split the package into `taisei` and `taisei-data`. The latter would be noarch and can be built just once, on a 64-bit userspace.
```sh
# taisei without data
cd /the/build/dir
ninja src/taisei doc/GAME.html doc/ENVIRON.html doc/STORY.txt doc/README.txt
meson install --destdir=/whatever --no-rebuild --tags runtime,doc,license,xdg
```
```sh
# taisei-data only
cd /the/build/dir
ninja resources/00-taisei.zip
meson install --destdir=/whatever --no-rebuild --tags resources
```
Unfortunately `meson install` isn't smart enough to only rebuild what's needed according to `--tags`, so the build targets have to be specified manually for now. I can alleviate this problem upstream by adding some shorthand alias build targets, though.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (30 preceding siblings ...)
2024-03-27 16:01 ` Akaricchi
@ 2024-03-27 16:07 ` Akaricchi
2024-03-27 16:07 ` Akaricchi
` (23 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2023154842
Comment:
> musl builds failing now...
Looks like another python-zstandard problem. My split package proposal should "fix" that too. But really it's python-zstandard that needs fixing here. You can also use `meson configure -Dpackage_data=disabled` to sidestep the whole compression problem.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (31 preceding siblings ...)
2024-03-27 16:07 ` Akaricchi
@ 2024-03-27 16:07 ` Akaricchi
2024-03-27 17:01 ` ahesford
` (22 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: Akaricchi @ 2024-03-27 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
New comment by Akaricchi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2023154842
Comment:
> musl builds failing now...
Looks like another python-zstandard problem. My split package proposal should "fix" that too. But really it's python-zstandard that needs fixing here. You can also use `meson configure -Dpackage_data=disabled` to sidestep the whole compression issue.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (32 preceding siblings ...)
2024-03-27 16:07 ` Akaricchi
@ 2024-03-27 17:01 ` ahesford
2024-03-27 20:10 ` tornaria
` (21 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-03-27 17:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2023319583
Comment:
We no longer support `noarch` packages, so there is no option but to build the package data for `i686`.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (33 preceding siblings ...)
2024-03-27 17:01 ` ahesford
@ 2024-03-27 20:10 ` tornaria
2024-03-28 9:30 ` [PR PATCH] [Updated] " aryalaadi
` (20 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-27 20:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2023877621
Comment:
> > musl builds failing now...
>
> Looks like another python-zstandard problem. My split package proposal should "fix" that too. But really it's python-zstandard that needs fixing here. You can also use `meson configure -Dpackage_data=disabled` to sidestep the whole compression issue.
This seems to be just a side-effect of `zstd` update which broke python-zstandard. Often the musl builders finish before the glibc builders, so your glibc CI run without the update and the musl CI run with the update.
Can you try again, now that python-zstandard has been rebuilt? (just rebase to current master and force push so the CI runs again).
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (34 preceding siblings ...)
2024-03-27 20:10 ` tornaria
@ 2024-03-28 9:30 ` aryalaadi
2024-03-28 9:38 ` aryalaadi
` (19 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-28 9:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10503 bytes --]
From d8654d1a49cfd88ea60483752c7a126c2df8dc64 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
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 | 14 ++--
5 files changed, 64 insertions(+), 159 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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..69323e66e837b0
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,42 @@
+diff --git a/scripts/meson.build b/scripts/meson.build
+index 7429e673..6a447070 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, '--disable_zstandard', 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..95b9cb00 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.disable_zstandard == 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('--disable_zstandard',
++ 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..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (35 preceding siblings ...)
2024-03-28 9:30 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-28 9:38 ` aryalaadi
2024-03-28 9:40 ` aryalaadi
` (18 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-28 9:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9911 bytes --]
From 5a8dbb81b2129ddf58af0c76f89555d22e9c78e5 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/taisei/patches/msse2.patch | 15 +++++
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
5 files changed, 43 insertions(+), 159 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..351271582362cf
--- /dev/null
+++ b/srcpkgs/taisei/patches/msse2.patch
@@ -0,0 +1,15 @@
+cglm incorrectly assumes that SSE2 is also available when SSE1
+ ===================================================================
+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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (36 preceding siblings ...)
2024-03-28 9:38 ` aryalaadi
@ 2024-03-28 9:40 ` aryalaadi
2024-03-28 9:42 ` aryalaadi
` (17 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-28 9:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2024779932
Comment:
> BTW, do you really need level=20 for zstd? That's supposed to use a lot of memory. Maybe 19 is good enough (or you could use something like 20 if sys.maxsize > 2**32 else 19).
I tried this and it builds for i686 without any issues (on my machine)
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (37 preceding siblings ...)
2024-03-28 9:40 ` aryalaadi
@ 2024-03-28 9:42 ` aryalaadi
2024-03-29 16:19 ` [PR PATCH] [Updated] " aryalaadi
` (16 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-28 9:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2024779932
Comment:
> BTW, do you really need level=20 for zstd? That's supposed to use a lot of memory. Maybe 19 is good enough (or you could use something like 20 if sys.maxsize > 2**32 else 19).
I tried this and it builds for i686 without any issues (on my machine, idk why github builds are failing)
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (38 preceding siblings ...)
2024-03-28 9:42 ` aryalaadi
@ 2024-03-29 16:19 ` aryalaadi
2024-03-29 23:11 ` tornaria
` (15 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-03-29 16:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9840 bytes --]
From 36353c57b1170892c56f9a9a1d5e23a762608b0e Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
msse2.patch:
cglm uses sse2 intrinsics and makes no attempt at being compatible
with sse. Note that x86_64 includes sse2 by definition, which is
why -msse and -msse2 make no difference at all on 64 bits.
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/taisei/patches/msse2.patch | 14 ++++
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
5 files changed, 42 insertions(+), 159 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..1558771bc54200
--- /dev/null
+++ b/srcpkgs/taisei/patches/msse2.patch
@@ -0,0 +1,14 @@
+cglm incorrectly assumes that SSE2 is also available when SSE1
+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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (39 preceding siblings ...)
2024-03-29 16:19 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-03-29 23:11 ` tornaria
2024-03-30 0:21 ` tornaria
` (14 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-29 23:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2027812358
Comment:
> > BTW, do you really need level=20 for zstd? That's supposed to use a lot of memory. Maybe 19 is good enough (or you could use something like 20 if sys.maxsize > 2**32 else 19).
>
> I tried this and it builds for i686 without any issues (on my machine, idk why github builds are failing)
Have you tried looking at "details" on the github run? It seems `python3-zstandard` is completely broken as you can check locally with
```
$ python -m zstandard
Traceback (most recent call last):
File "<frozen runpy>", line 189, in _run_module_as_main
File "<frozen runpy>", line 148, in _get_module_details
File "<frozen runpy>", line 112, in _get_module_details
File "/usr/lib/python3.12/site-packages/zstandard/__init__.py", line 39, in <module>
from .backend_c import * # type: ignore
^^^^^^^^^^^^^^^^^^^^^^^^
ImportError: zstd C API versions mismatch; Python bindings were not compiled/linked against expected zstd version (10506 returned by the lib, 10506 hardcoded in zstd headers, 10505 hardcoded in the cext)
```
It seems upstream for `python3-zstandard` hardcodes the version of zstd that can be used :facepalm:
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (40 preceding siblings ...)
2024-03-29 23:11 ` tornaria
@ 2024-03-30 0:21 ` tornaria
2024-03-30 13:28 ` unspecd
` (13 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-03-30 0:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2027841133
Comment:
@unspecd here in this PR we are having trouble with `python3-zstandard` which seems to be completely broken atm.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (41 preceding siblings ...)
2024-03-30 0:21 ` tornaria
@ 2024-03-30 13:28 ` unspecd
2024-03-31 20:49 ` recp
` (12 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: unspecd @ 2024-03-30 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by unspecd on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2028060471
Comment:
@tornaria
I just updated the package `python3-zstandard`.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (42 preceding siblings ...)
2024-03-30 13:28 ` unspecd
@ 2024-03-31 20:49 ` recp
2024-04-01 15:14 ` recp
` (11 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: recp @ 2024-03-31 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 421 bytes --]
New comment by recp on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2028901294
Comment:
> since cglm uses sse2 intrinsics and makes no attempt at being compatible with sse
I've just started to fix SSE / SSE2 compatibility issue at https://github.com/recp/cglm/pull/412 since I have 64bit arch only any help, testing on see-only environment, feedback would be awesome
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (43 preceding siblings ...)
2024-03-31 20:49 ` recp
@ 2024-04-01 15:14 ` recp
2024-04-02 6:00 ` aryalaadi
` (10 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: recp @ 2024-04-01 15:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 811 bytes --]
New comment by recp on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2029925425
Comment:
> For what it's worth, openSUSE doesn't build Taisei for i686, because CGLM fails (or at least used to fail) some unit tests on that platform. It doesn't look like i686 support is well maintained there, and we neither test nor provide i686 Linux builds of Taisei either.
@Akaricchi I have fixed some tests when `-ffast-math` option enable at: https://github.com/recp/cglm/pull/412 maybe that caused to fail. I would like to see the test results to fix them asap. I also tried to test on 32bit Debian, all tests are passed now.
v0.9.4 of **cglm** is released: https://github.com/recp/cglm/releases I hope SSE can now work without any issue and SSE2 requirement 🚀
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (44 preceding siblings ...)
2024-04-01 15:14 ` recp
@ 2024-04-02 6:00 ` aryalaadi
2024-04-02 6:35 ` [PR PATCH] [Updated] " aryalaadi
` (9 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 6:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2031138591
Comment:
> v0.9.4 of **cglm** is released: https://github.com/recp/cglm/releases I hope SSE can now work without any issue and SSE2 requirement 🚀
thank you, I'll bump the cglm package to 0.9.4 when I'm free
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (45 preceding siblings ...)
2024-04-02 6:00 ` aryalaadi
@ 2024-04-02 6:35 ` aryalaadi
2024-04-02 6:41 ` aryalaadi
` (8 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 6:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 9661 bytes --]
From 3116a2a48e37c2db63988f26e8b7786f70bf3034 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1 cglm: update to 0.9.4
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/cglm/template | 6 +-
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
5 files changed, 31 insertions(+), 162 deletions(-)
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/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..4a09a585e359ae 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aaditya Aryal <aryalaadi123@gmail.com>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (46 preceding siblings ...)
2024-04-02 6:35 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-04-02 6:41 ` aryalaadi
2024-04-02 6:49 ` aryalaadi
` (7 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 6:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10623 bytes --]
From 99cb525b58a8e00a728222acdce1602b54528ab5 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
cglm: update to 0.9.4
zstd: update to 0.22.0
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/cglm/template | 6 +-
srcpkgs/python3-zstandard/template | 4 +-
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
6 files changed, 33 insertions(+), 164 deletions(-)
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/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..4a09a585e359ae 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aaditya Aryal <aryalaadi123@gmail.com>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index aad45b3a808fd1..417422372fcfd1 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,6 +1,6 @@
# Template file for 'python3-zstandard'
pkgname=python3-zstandard
-version=0.21.0
+version=0.22.0
revision=2
build_style=python3-module
make_build_args="--system-zstd"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/indygreg/python-zstandard"
changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
pre_check() {
# The skipped test ignored due to failure, see:
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (47 preceding siblings ...)
2024-04-02 6:41 ` aryalaadi
@ 2024-04-02 6:49 ` aryalaadi
2024-04-02 6:52 ` aryalaadi
` (6 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 6:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 11034 bytes --]
From 38aecc348f3ef6be83282092e51df114ce07b3f9 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
cglm: update to 0.9.4
zstd: update to 0.22.0
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/cglm/template | 6 +-
srcpkgs/python3-zstandard/template | 8 +--
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
6 files changed, 35 insertions(+), 166 deletions(-)
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/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..4a09a585e359ae 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aaditya Aryal <aryalaadi123@gmail.com>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..362de587eb1552 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,20 +1,20 @@
# Template file for 'python3-zstandard'
pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
build_style=python3-module
make_build_args="--system-zstd"
hostmakedepends="python3-setuptools"
makedepends="python3-devel libzstd-devel"
depends="python3"
checkdepends="python3-hypothesis"
-short_desc="Python bindings to the Zstandard (zstd) compression library"
+short_desc="Python bindings to the Zstandard (zstd) compression library"short_desc="Python bindings to the Zstandard (zstd) compression library"
maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/indygreg/python-zstandard"
changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
pre_check() {
# The skipped test ignored due to failure, see:
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (48 preceding siblings ...)
2024-04-02 6:49 ` aryalaadi
@ 2024-04-02 6:52 ` aryalaadi
2024-04-02 7:07 ` aryalaadi
` (5 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 6:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 10673 bytes --]
From 90848130e498b446d5c178baacdf336614c0f8d6 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Mon, 18 Mar 2024 16:43:59 +0545
Subject: [PATCH] taisei: update to 1.4.1
cglm: update to 0.9.4
zstd: update to 0.22.0
zstdoom.patch:
the i686 builds fail because zstd runs out of memory, bumping
python3-zstandard did not fix the issue so this patch is needed
to reduce compression level and make sure i686 build does not fail.
---
srcpkgs/cglm/template | 6 +-
srcpkgs/python3-zstandard/template | 6 +-
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
6 files changed, 34 insertions(+), 165 deletions(-)
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/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..4a09a585e359ae 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aaditya Aryal <aryalaadi123@gmail.com>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..36907f76c111c1 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,7 +1,7 @@
# Template file for 'python3-zstandard'
pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
build_style=python3-module
make_build_args="--system-zstd"
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/indygreg/python-zstandard"
changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
pre_check() {
# The skipped test ignored due to failure, see:
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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (49 preceding siblings ...)
2024-04-02 6:52 ` aryalaadi
@ 2024-04-02 7:07 ` aryalaadi
2024-04-02 7:53 ` aryalaadi
` (4 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 11903 bytes --]
From a52c976a04e4f2347bc74a473b12c3b57a40b01c Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 12:50:50 +0545
Subject: [PATCH 1/3] cglm: update to 0.9.4
---
srcpkgs/cglm/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..4a09a585e359ae 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,14 +1,14 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Aaditya Aryal <aryalaadi123@gmail.com>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
From 512781b2acd12538bc1f7cc1719c85221b8407ab Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 12:51:19 +0545
Subject: [PATCH 2/3] taisei: update to 1.4.1
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
4 files changed, 28 insertions(+), 159 deletions(-)
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/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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
From a55738b7b0a8ae122ecf7d37d4c19a517c17f1b2 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 12:51:46 +0545
Subject: [PATCH 3/3] python3-zstandard: update to 0.22.0
---
.../patches/disablehardcodedversion.patch | 11 +++++++++++
srcpkgs/python3-zstandard/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
diff --git a/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch b/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
new file mode 100644
index 00000000000000..3b72fa20c73a9e
--- /dev/null
+++ b/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
@@ -0,0 +1,11 @@
+--- a/c-ext/backend_c.c 2023-11-01 02:58:34.000000000 -0300
++++ b/c-ext/backend_c.c 2024-03-29 21:32:40.694372789 -0300
+@@ -152,7 +152,7 @@
+ PyObject *features = NULL;
+ PyObject *feature = NULL;
+ unsigned zstd_ver_no = ZSTD_versionNumber();
+- unsigned our_hardcoded_version = 10505;
++ unsigned our_hardcoded_version = ZSTD_VERSION_NUMBER;
+ if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
+ zstd_ver_no != our_hardcoded_version) {
+ PyErr_Format(
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..36907f76c111c1 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,7 +1,7 @@
# Template file for 'python3-zstandard'
pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
build_style=python3-module
make_build_args="--system-zstd"
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/indygreg/python-zstandard"
changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
pre_check() {
# The skipped test ignored due to failure, see:
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (50 preceding siblings ...)
2024-04-02 7:07 ` aryalaadi
@ 2024-04-02 7:53 ` aryalaadi
2024-04-02 11:44 ` [PR REVIEW] " ahesford
` (3 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 7:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2031315254
Comment:
@tornaria I've added the python3-standard patch you suggested and also bumped (and adopted) cglm.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (51 preceding siblings ...)
2024-04-02 7:53 ` aryalaadi
@ 2024-04-02 11:44 ` ahesford
2024-04-02 13:02 ` [PR PATCH] [Updated] " aryalaadi
` (2 subsequent siblings)
55 siblings, 0 replies; 57+ messages in thread
From: ahesford @ 2024-04-02 11:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1547708744
Comment:
Please drop the maintainer change; we like to see a longer history of package management before people put their names on packages.
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR PATCH] [Updated] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (52 preceding siblings ...)
2024-04-02 11:44 ` [PR REVIEW] " ahesford
@ 2024-04-02 13:02 ` aryalaadi
2024-04-02 13:03 ` [PR REVIEW] " aryalaadi
2024-04-03 21:24 ` tornaria
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is an updated pull request by aryalaadi against master on the void-packages repository
https://github.com/aryalaadi/void-packages taisei
https://github.com/void-linux/void-packages/pull/49348
taisei: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49348.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-taisei-49348.patch --]
[-- Type: text/x-diff, Size: 11861 bytes --]
From f238c9b6d977181d62dd2fa61279d0b0dd0bced3 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 18:46:49 +0545
Subject: [PATCH 1/3] cglm: update to 0.9.4
---
srcpkgs/cglm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cglm/template b/srcpkgs/cglm/template
index d9e7ec8a5d47af..11832259301993 100644
--- a/srcpkgs/cglm/template
+++ b/srcpkgs/cglm/template
@@ -1,6 +1,6 @@
# Template file for 'cglm'
pkgname=cglm
-version=0.9.2
+version=0.9.4
revision=1
build_style=meson
short_desc="Highly Optimized Graphics Math (glm) for C"
@@ -8,7 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/recp/cglm"
distfiles="https://github.com/recp/cglm/archive/v${version}.tar.gz"
-checksum=5c0639fe125c00ffaa73be5eeecd6be999839401e76cf4ee05ac2883447a5b4d
+checksum=101376d9f5db7139a54db35ccc439e40b679bc2efb756d3469d39ee38e69c41b
post_install() {
vlicense LICENSE
From 329439b15a93fec7ede3a386a5abc4b1ca98ccf6 Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 18:47:08 +0545
Subject: [PATCH 2/3] python3-zstandard: update to 0.22.0
---
.../patches/disablehardcodedversion.patch | 11 +++++++++++
srcpkgs/python3-zstandard/template | 6 +++---
2 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
diff --git a/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch b/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
new file mode 100644
index 00000000000000..3b72fa20c73a9e
--- /dev/null
+++ b/srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
@@ -0,0 +1,11 @@
+--- a/c-ext/backend_c.c 2023-11-01 02:58:34.000000000 -0300
++++ b/c-ext/backend_c.c 2024-03-29 21:32:40.694372789 -0300
+@@ -152,7 +152,7 @@
+ PyObject *features = NULL;
+ PyObject *feature = NULL;
+ unsigned zstd_ver_no = ZSTD_versionNumber();
+- unsigned our_hardcoded_version = 10505;
++ unsigned our_hardcoded_version = ZSTD_VERSION_NUMBER;
+ if (ZSTD_VERSION_NUMBER != our_hardcoded_version ||
+ zstd_ver_no != our_hardcoded_version) {
+ PyErr_Format(
diff --git a/srcpkgs/python3-zstandard/template b/srcpkgs/python3-zstandard/template
index d59cbb09b965fc..36907f76c111c1 100644
--- a/srcpkgs/python3-zstandard/template
+++ b/srcpkgs/python3-zstandard/template
@@ -1,7 +1,7 @@
# Template file for 'python3-zstandard'
pkgname=python3-zstandard
-version=0.21.0
-revision=3
+version=0.22.0
+revision=1
build_style=python3-module
make_build_args="--system-zstd"
hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/indygreg/python-zstandard"
changelog="https://raw.githubusercontent.com/indygreg/python-zstandard/main/docs/news.rst"
distfiles="https://github.com/indygreg/python-zstandard/archive/${version}.tar.gz"
-checksum=15adc6bfa629d48b0bb658e9eae94c484adb66a28738fa780478eebeb41599a5
+checksum=34ce7ef020afca1344c538a778e2a2e30dc43b11509aa4cb5cf076228d959ca7
pre_check() {
# The skipped test ignored due to failure, see:
From 437c448d9a351864af2ba0876b035c818fc39e7a Mon Sep 17 00:00:00 2001
From: Aaditya Aryal <aryalaadi123@gmail.com>
Date: Tue, 2 Apr 2024 18:47:24 +0545
Subject: [PATCH 3/3] taisei: update to 1.4.1
---
srcpkgs/taisei/patches/openssl1.patch | 95 ---------------------------
srcpkgs/taisei/patches/openssl2.patch | 57 ----------------
srcpkgs/taisei/patches/zstdoom.patch | 21 ++++++
srcpkgs/taisei/template | 14 ++--
4 files changed, 28 insertions(+), 159 deletions(-)
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/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 <openssl/sha.h>
--
--struct SHA256State {
-- SHA256_CTX context;
--};
-+#include <openssl/evp.h>
-
- 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..d6646b29d6a5a9
--- /dev/null
+++ b/srcpkgs/taisei/patches/zstdoom.patch
@@ -0,0 +1,21 @@
+python3-zstandard runs out of memeory on i686 with comp_level=20
+diff --git a/scripts/pack.py b/scripts/pack.py
+index 913e5a66..a7d1d9c0 100755
+--- a/scripts/pack.py
++++ b/scripts/pack.py
+@@ -104,12 +104,12 @@ def log_file(path, arcname, comp_type=None):
+ def pack(args):
+ nocompress_file = args.directory / '.nocompress'
+
+- if 1:
++ if sys.maxsize > 2**32:
+ comp_type = ZIP_ZSTANDARD
+ comp_level = 20
+ else:
+- comp_type = ZIP_DEFLATED
+- comp_level = 9
++ comp_type = ZIP_ZSTANDARD
++ comp_level = 19
+
+ try:
+ nocompress = list(map(re.compile, filter(None, nocompress_file.read_text().strip().split('\n'))))
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 52d2834a7166fe..97bb1d6d3f187b 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,18 +1,18 @@
# 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"
-makedepends="SDL2_mixer-devel freetype-devel libwebp-devel libzip-devel cglm
- opusfile-devel"
+hostmakedepends="pkg-config python3-docutils python3-zstandard"
+makedepends="SDL2-devel libpng-devel zlib-devel freetype-devel libwebp-devel
+ libzip-devel cglm opusfile-devel"
depends="${pkgname}-data"
short_desc="Free and open-source Touhou Project clone and fangame"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
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
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: [PR REVIEW] taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (53 preceding siblings ...)
2024-04-02 13:02 ` [PR PATCH] [Updated] " aryalaadi
@ 2024-04-02 13:03 ` aryalaadi
2024-04-03 21:24 ` tornaria
55 siblings, 0 replies; 57+ messages in thread
From: aryalaadi @ 2024-04-02 13:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by aryalaadi on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#discussion_r1547840844
Comment:
okay
^ permalink raw reply [flat|nested] 57+ messages in thread
* Re: taisei: update to 1.4.1
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
` (54 preceding siblings ...)
2024-04-02 13:03 ` [PR REVIEW] " aryalaadi
@ 2024-04-03 21:24 ` tornaria
55 siblings, 0 replies; 57+ messages in thread
From: tornaria @ 2024-04-03 21:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/49348#issuecomment-2035621066
Comment:
This looks better to me than #49606 in that it avoids the vendored zstd.
^ permalink raw reply [flat|nested] 57+ messages in thread
end of thread, other threads:[~2024-04-03 21:24 UTC | newest]
Thread overview: 57+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-18 11:00 [PR PATCH] taisei 1.4.1 version bump aryalaadi
2024-03-25 16:35 ` [PR PATCH] [Updated] " aryalaadi
2024-03-25 16:51 ` aryalaadi
2024-03-25 16:55 ` [PR REVIEW] taisei: update to 1.4.1 tornaria
2024-03-25 16:56 ` tornaria
2024-03-25 17:00 ` [PR PATCH] [Updated] " aryalaadi
2024-03-25 17:04 ` aryalaadi
2024-03-25 17:16 ` aryalaadi
2024-03-26 14:07 ` [PR REVIEW] " tornaria
2024-03-26 16:17 ` [PR PATCH] [Updated] " aryalaadi
2024-03-26 16:29 ` tornaria
2024-03-26 23:54 ` ahesford
2024-03-27 3:38 ` tornaria
2024-03-27 3:54 ` [PR PATCH] [Updated] " aryalaadi
2024-03-27 3:56 ` aryalaadi
2024-03-27 3:57 ` [PR PATCH] [Updated] " aryalaadi
2024-03-27 4:27 ` aryalaadi
2024-03-27 4:32 ` aryalaadi
2024-03-27 11:01 ` [PR REVIEW] " tornaria
2024-03-27 11:10 ` tornaria
2024-03-27 11:24 ` ahesford
2024-03-27 11:24 ` ahesford
2024-03-27 11:30 ` ahesford
2024-03-27 13:05 ` [PR REVIEW] " Akaricchi
2024-03-27 13:29 ` Akaricchi
2024-03-27 13:29 ` Akaricchi
2024-03-27 13:30 ` Akaricchi
2024-03-27 14:24 ` tornaria
2024-03-27 14:49 ` [PR PATCH] [Updated] " aryalaadi
2024-03-27 14:51 ` aryalaadi
2024-03-27 14:57 ` aryalaadi
2024-03-27 16:01 ` Akaricchi
2024-03-27 16:07 ` Akaricchi
2024-03-27 16:07 ` Akaricchi
2024-03-27 17:01 ` ahesford
2024-03-27 20:10 ` tornaria
2024-03-28 9:30 ` [PR PATCH] [Updated] " aryalaadi
2024-03-28 9:38 ` aryalaadi
2024-03-28 9:40 ` aryalaadi
2024-03-28 9:42 ` aryalaadi
2024-03-29 16:19 ` [PR PATCH] [Updated] " aryalaadi
2024-03-29 23:11 ` tornaria
2024-03-30 0:21 ` tornaria
2024-03-30 13:28 ` unspecd
2024-03-31 20:49 ` recp
2024-04-01 15:14 ` recp
2024-04-02 6:00 ` aryalaadi
2024-04-02 6:35 ` [PR PATCH] [Updated] " aryalaadi
2024-04-02 6:41 ` aryalaadi
2024-04-02 6:49 ` aryalaadi
2024-04-02 6:52 ` aryalaadi
2024-04-02 7:07 ` aryalaadi
2024-04-02 7:53 ` aryalaadi
2024-04-02 11:44 ` [PR REVIEW] " ahesford
2024-04-02 13:02 ` [PR PATCH] [Updated] " aryalaadi
2024-04-02 13:03 ` [PR REVIEW] " aryalaadi
2024-04-03 21:24 ` tornaria
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).