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.

Sign up for GitHub

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

SDL 2.30.0 #2705

Merged
merged 7 commits into from
Feb 4, 2024
Merged

SDL 2.30.0 #2705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bf5dbf2
SDL 2.29.2 pre-release and fix the surface test fails
oddbookworm Jan 22, 2024
3acdba3
fix sha512 checksum
oddbookworm Jan 22, 2024
6855f99
Merge pull request #2689 from oddbookworm/fix-error-reporting-sdl-2.2…
Matiiss Jan 22, 2024
e93dd7c
2.29.3
Starbuck5 Jan 28, 2024
aa2b8f6
Merge branch 'main' of https://github.com/pygame-community/pygame-ce …
oddbookworm Jan 29, 2024
61a1706
Merge branch 'oddbookwormfix-error-reporting-sdl-2.29.2+' of https://…
oddbookworm Feb 3, 2024
fc0d76e
bump windows and mac deps to SDL 2.30.0 release
oddbookworm Feb 3, 2024
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
8 changes: 4 additions & 4 deletions buildconfig/download_win_prebuilt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):
url_sha1 = []
url_sha1.extend([
[
'https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-devel-2.28.5-VC.zip',
'7469e9ea44d30a48b0510328cd94b25596e0aa0f',
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.0/SDL2-devel-2.30.0-VC.zip',
'cc0cc9ce3526bdec53cf314e499b4d822a9af5d4',
],
[
'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
Expand Down Expand Up @@ -234,12 +234,12 @@ def copy(src, dst):
copy(
os.path.join(
temp_dir,
'SDL2-devel-2.28.5-VC/SDL2-2.28.5'
'SDL2-devel-2.30.0-VC/SDL2-2.30.0'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2-2.28.5'
'SDL2-2.30.0'
)
)

Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

cd $(dirname `readlink -f "$0"`)

SDL2="SDL2-2.28.5"
SDL2="SDL2-2.30.0"
IMG2="SDL2_image-2.8.2"
TTF2="SDL2_ttf-2.22.0"
MIX2="SDL2_mixer-2.6.3"
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
12593eb78fcca877a8dfb78cf21a4e6feba7dc87c964de378ac462b36d8e41ecb587222cb41d5f56dd35b838e1b9867b8ae0cf2f4d2a01afaf23ac8c11edc84d SDL2-2.28.5.tar.gz
6eac264db52342d3af338745c5ee7c627982a661194686e06e0ea44d4eb38f88d0b451656edf3169334570ee484132e5a74ab9ed56f9de359728d48f93a0aafa SDL2-2.30.0.tar.gz
0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454 SDL2_image-2.8.2.tar.gz
2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740 SDL2_mixer-2.6.3.tar.gz
34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912 SDL2_ttf-2.22.0.tar.gz
6 changes: 4 additions & 2 deletions src_c/surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,8 @@ surf_convert(pgSurfaceObject *self, PyObject *args)
}
else {
newsurf = pg_DisplayFormat(surf);
SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE);
if (newsurf)
SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_NONE);
}

if (newsurf == NULL) {
Expand Down Expand Up @@ -1679,7 +1680,8 @@ surf_convert_alpha(pgSurfaceObject *self, PyObject *args)
}

newsurf = pg_DisplayFormatAlpha(surf);
SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_BLEND);
if (newsurf)
SDL_SetSurfaceBlendMode(newsurf, SDL_BLENDMODE_BLEND);
final = surf_subtype_new(Py_TYPE(self), newsurf, 1);

if (!final)
Expand Down
Loading