Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

taisei: update to 1.4.1 #49348

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions srcpkgs/cglm/template
Original file line number Diff line number Diff line change
@@ -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>"
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
Expand Down
11 changes: 11 additions & 0 deletions srcpkgs/python3-zstandard/patches/disablehardcodedversion.patch
Original file line number Diff line number Diff line change
@@ -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(
6 changes: 3 additions & 3 deletions srcpkgs/python3-zstandard/template
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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:
Expand Down
95 changes: 0 additions & 95 deletions srcpkgs/taisei/patches/openssl1.patch

This file was deleted.

57 changes: 0 additions & 57 deletions srcpkgs/taisei/patches/openssl2.patch

This file was deleted.

21 changes: 21 additions & 0 deletions srcpkgs/taisei/patches/zstdoom.patch
Original file line number Diff line number Diff line change
@@ -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'))))
14 changes: 7 additions & 7 deletions srcpkgs/taisei/template
Original file line number Diff line number Diff line change
@@ -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
Expand Down