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

Update to SDL_image 2.8.2 #2674

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Update to SDL_image 2.8.2 #2674

merged 1 commit into from
Jan 19, 2024

Conversation

Starbuck5
Copy link
Member

@Starbuck5 Starbuck5 commented Jan 17, 2024

I updated the libpng in the SDL_image windows bundle, so this fixes #2650

Libpng now statically links to zlib, so the windows wheels no longer have any zlib DLL floating around.

Copy link
Member

@ankith26 ankith26 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if zlib1.dll should be removed entirely? It is still not entirely clear if something else needs zlib, so potentially there could be a break on some systems where zlib isn't available outside?

@Starbuck5
Copy link
Member Author

Other things do rely on zlib, but they also have it statically. I believe libtiff is in this camp. None of the SDL lib prebuilts (which come with everything they need) contain an explicit zlib DLL right now, so I'm comfortable removing it.

I didn't extricate from the build tooling yet, so it will look for zlib at build time with windows buildconfig and not find it, but that's 100% fine.

@ankith26
Copy link
Member

So I was not feeling super confident, and I decided to fire a fresh windows VM to give this PR a spin, and got the classic error that everyone hates

Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "C:\Users\vboxuser\AppData\Local\Programs\Python\Python312\Lib\site-packages\pygame\tests\__main__.py", line 143, in <module>
    run_and_exit(*args, **kwds)
  File "C:\Users\vboxuser\AppData\Local\Programs\Python\Python312\Lib\site-packages\pygame\tests\test_utils\run_tests.py", line 346, in run_and_exit
    total, fails = run(*args, **kwargs)
                   ^^^^^^^^^^^^^^^^^^^^
  File "C:\Users\vboxuser\AppData\Local\Programs\Python\Python312\Lib\site-packages\pygame\tests\test_utils\run_tests.py", line 303, in run
    raise AssertionError(
AssertionError: Something went wrong in the Test Machinery:
total: 2167 != untrusty_total: 2166

More details: This is a fresh windows 11 with nothing else but python 3.12 installed. However when I do py -m pygame.tests.image_test everything still passes

@ankith26
Copy link
Member

Okay so the same issue happens with 2.4.0 too

@Starbuck5
Copy link
Member Author

I wonder if we could modify the test runner so it could tell us what module segfaulted, or even what function segfaulted. That would be much more handy.

Copy link
Member

@ankith26 ankith26 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, I figured that those fails are not really related to this PR at all, and this PR LGTM! Thanks 🎉

For completeness sake, this PR could also bump the SDL_image on mac/manylinux, but I could also do it in a future PR if you say so.

@Starbuck5
Copy link
Member Author

For completeness sake, this PR could also bump the SDL_image on mac/manylinux, but I could also do it in a future PR if you say so.

This PR does that already :)

@ankith26
Copy link
Member

Oh mb I didn't scroll down completely 🤦‍♂️

@ankith26 ankith26 merged commit dd03b30 into main Jan 19, 2024
29 checks passed
@Starbuck5 Starbuck5 added this to the 2.5.0 milestone Jan 19, 2024
@Starbuck5 Starbuck5 deleted the sdl-image-2.8.2 branch January 19, 2024 06:23
@Starbuck5 Starbuck5 added the bugfix PR that fixes bug label Feb 18, 2024
Starbuck5 pushed a commit that referenced this pull request Feb 18, 2024
@Starbuck5 Starbuck5 modified the milestones: 2.5.0, 2.4.1 Feb 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix PR that fixes bug dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Win10 libpng16-16.dll incompatibility - fixed with older DLL
3 participants