From: aryalaadi <aryalaadi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] taisei: update to 1.4.1
Date: Mon, 25 Mar 2024 18:16:02 +0100 [thread overview]
Message-ID: <20240325171602.D383621E3C@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49348@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2024-03-25 17:16 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240325171602.D383621E3C@inbox.vuxu.org \
--to=aryalaadi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).