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

Bump SDL to 2.26.4 (along with other deps bumps) #2057

Merged
merged 1 commit into from
Mar 30, 2023

Conversation

ankith26
Copy link
Member

Basically mac/manylinux companion of #1986 along with a bunch of other related dependency updates sprinked in for good measure.

This may conflict with my older #1997 (which may need more testing/tinkering) so I'd like this to be merged first

@ankith26 ankith26 requested a review from a team as a code owner March 26, 2023 11:14
@Starbuck5
Copy link
Member

Starbuck5 commented Mar 26, 2023

This looks pretty straightforward, the deletion of jpeg seems like the strangest thing in the PR. I assume we were using libjpeg-turbo already and this just cleans up the unused libjpeg.

Edit: okay yeah that is what is going on

Copy link
Member

@Starbuck5 Starbuck5 left a comment

Choose a reason for hiding this comment

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

This looks good. I don't have easy access to a system to test this locally right now, so I haven't.

I'd like somebody to test the new wheels.

Copy link
Member

@MyreMylar MyreMylar left a comment

Choose a reason for hiding this comment

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

This all looks fine to me also, but it makes sense to have someone not on a windows machine actually try out these wheels.

I assume we can do that from this PR, I have the loosest understanding of this process that goes:

  1. docker builds the manylinux wheels.
  2. We distribute them via PyPI.

I have no clue if there is a button one has to hit to make step 1 happen with this PR active. Or do we need to merge it first to make docker build the wheels?

@oddbookworm
Copy link
Member

Looks good on my side. Ran a few test scripts and I didn't notice any problems

Python 3.10.9 (main, Dec 19 2022, 17:35:49) [GCC 12.2.0] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import pygame
pygame-ce 2.2.0 (SDL 2.26.4, Python 3.10.9)
>>> pygame.init()
(5, 0)
>>> pygame.print_debug_info()
Platform:               Linux-6.2.2-MANJARO-x86_64-with-glibc2.37
System:                 Linux
System Version:         #3 SMP PREEMPT_DYNAMIC Tue Mar  7 16:08:02 CST 2023
Processor:
Architecture:           Bits: 64bit     Linkage: ELF
Driver:                 x11

Python:                 CPython
pygame version:         2.2.0
python version:         3.10.9

SDL versions:           Linked: 2.26.4  Compiled: 2.26.4
SDL Mixer versions:     Linked: 2.6.3   Compiled: 2.6.3
SDL Font versions:      Linked: 2.20.2  Compiled: 2.20.2
SDL Image versions:     Linked: 2.0.5   Compiled: 2.0.5
Freetype versions:      Linked: 2.13.0  Compiled: 2.13.0

@oddbookworm
Copy link
Member

I also validated this on my Mac. My testing didn't turn up any problems

>>> pygame.print_debug_info()
Platform:		macOS-11.7.4-x86_64-i386-64bit
System:			Darwin
System Version:		Darwin Kernel Version 20.6.0: Fri Dec 16 00:35:00 PST 2022; root:xnu-7195.141.49~1/RELEASE_X86_64
Processor:		i386
Architecture:		Bits: 64bit	Linkage: 
Driver:			cocoa

Python:			CPython
pygame version:		2.2.0
python version:		3.11.2

SDL versions:		Linked: 2.26.4	Compiled: 2.26.4
SDL Mixer versions:	Linked: 2.6.3	Compiled: 2.6.3
SDL Font versions:	Linked: 2.20.2	Compiled: 2.20.2
SDL Image versions:	Linked: 2.0.5	Compiled: 2.0.5
Freetype versions:	Linked: 2.13.0	Compiled: 2.13.0

@Starbuck5 Starbuck5 merged commit fdad67a into main Mar 30, 2023
@Starbuck5 Starbuck5 added this to the 2.3 milestone Mar 30, 2023
@Starbuck5 Starbuck5 modified the milestones: 2.3, 2.2.1 Apr 3, 2023
@MyreMylar MyreMylar deleted the ankith26-deps-updates branch May 29, 2023 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants