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.29.2 pre-release #2684

Closed
wants to merge 2 commits into from
Closed

SDL 2.29.2 pre-release #2684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
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/prerelease-2.29.2/SDL2-devel-2.29.2-VC.zip',
'338870018bca5361829cba2d7e5f0a9260ca39c5',
],
[
'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.29.2-VC/SDL2-2.29.2'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2-2.28.5'
'SDL2-2.29.2'
)
)

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.29.2"
IMG2="SDL2_image-2.8.2"
TTF2="SDL2_ttf-2.20.2"
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
d17b1132b10e3d4171e4459cd86d065338c797ea6a31686ab9510e59e866451ff4cf9cf9aaaf06db6369eb55728837198d601be1fbab6fac2fb2ce00d5272734 SDL2-2.29.2.tar.gz
0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454 SDL2_image-2.8.2.tar.gz
2e9da045d2fdab97236c3901b3d441834a67a47c8851ddfb817c9db6f23ed9fb355a5ef8d2158d0c9959a83934e8cd1b95db8a69eaddf8f7fcca115f01818740 SDL2_mixer-2.6.3.tar.gz
b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c SDL2_ttf-2.20.2.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