-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
taisei: update to 1.4.1 #49348
Conversation
6c2d90b
to
37fc604
Compare
Great! Could you submit your patches as PR to upstream? @ahesford: this LGTM now |
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 |
I suggested it, since 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.
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 |
8e1976d
to
6fecac1
Compare
when packaging taisei for void-linux, the i686 builds were failing the following changes fixes the build issues for i686 related: void-linux/void-packages#49348
sure, but before that I will look into cglm and zstandard to see if I fix the root issue |
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. |
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 |
An easy way is to check out this branch, then do
You can put patches in
Isn't that a good reason to build with sse2 by default?
You can achieve a similar result without sse using 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 |
0721e12
to
5c54c74
Compare
musl builds failing now... |
I'm not a Void user, so I think I'll just set up the i686 version of Void in a container for testing.
I don't mind bumping it up to
Not really.
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 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 # taisei-data only
cd /the/build/dir
ninja resources/00-taisei.zip
meson install --destdir=/whatever --no-rebuild --tags resources Unfortunately |
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 |
We no longer support |
This seems to be just a side-effect of Can you try again, now that python-zstandard has been rebuilt? (just rebase to current master and force push so the CI runs again). |
Have you tried looking at "details" on the github run? It seems
It seems upstream for |
@unspecd here in this PR we are having trouble with |
@tornaria |
I've just started to fix SSE / SSE2 compatibility issue at recp/cglm#412 since I have 64bit arch only any help, testing on see-only environment, feedback would be awesome |
@Akaricchi I have fixed some tests when 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 |
9084813
to
a55738b
Compare
@tornaria I've added the python3-standard patch you suggested and also bumped (and adopted) cglm. |
This looks better to me than #49606 in that it avoids the vendored zstd. |
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it. |
needs rebase |
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it. |
Testing the changes