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

Bump SDL to 2.30.11 and SDL_ttf to 2.24.0 #3279

Merged
merged 2 commits into from
Jan 4, 2025
Merged

Bump SDL to 2.30.11 and SDL_ttf to 2.24.0 #3279

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
395e9bc
Bump SDL_ttf to 2.24.0
ankith26 Jan 4, 2025
8454447
Bump SDL to 2.30.11
ankith26 Jan 4, 2025
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
16 changes: 8 additions & 8 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.30.10/SDL2-devel-2.30.10-VC.zip',
'42378fd090d547d03dca8c9df584ba8f38555809',
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.11/SDL2-devel-2.30.11-VC.zip',
'163e3300a1450e6e7d4fff0d35b039c3eae44e79',
],
[
'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.6/SDL3-devel-3.1.6-VC.zip',
Expand All @@ -94,8 +94,8 @@ def get_urls(x86=True, x64=True):
'8538fea0cc4aabba2fc64db06196f1bb76a2785f'
],
[
'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.22.0/SDL2_ttf-devel-2.22.0-VC.zip',
'2d4f131909af2985b5ebc5ed296d28628c87c243'
'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip',
'2d18b9a4fc2ec0eee80de2a946b088d4e6efd0ee'
],
[
'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.0/SDL2_mixer-devel-2.8.0-VC.zip',
Expand Down Expand Up @@ -243,23 +243,23 @@ def copy(src, dst):
copy(
os.path.join(
temp_dir,
'SDL2_ttf-devel-2.22.0-VC/SDL2_ttf-2.22.0'
'SDL2_ttf-devel-2.24.0-VC/SDL2_ttf-2.24.0'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2_ttf-2.22.0'
'SDL2_ttf-2.24.0'
)
)
copy(
os.path.join(
temp_dir,
'SDL2-devel-2.30.10-VC/SDL2-2.30.10'
'SDL2-devel-2.30.11-VC/SDL2-2.30.11'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2-2.30.10'
'SDL2-2.30.11'
)
)
copy(
Expand Down
4 changes: 2 additions & 2 deletions 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,11 +3,11 @@ set -e -x

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

SDL2_VER="2.30.10"
SDL2_VER="2.30.11"
SDL2="SDL2-$SDL2_VER"
IMG2_VER="2.8.3"
IMG2="SDL2_image-$IMG2_VER"
TTF2_VER="2.22.0"
TTF2_VER="2.24.0"
TTF2="SDL2_ttf-$TTF2_VER"
MIX2_VER="2.8.0"
MIX2="SDL2_mixer-$MIX2_VER"
Expand Down
4 changes: 2 additions & 2 deletions 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 @@
bcb220749cd3b0874288d617419e622701138bcb8fe55e9b665e8843c65afda031d01afe0d11e308a9608724ed151f342e5f5670c84204b36943cb323ced41da SDL2-2.30.10.tar.gz
cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 SDL2-2.30.11.tar.gz
b49e466494a4bebcacc09e3fe2afbe5edbae636c007cd26e7e04301bf8fe54db6751258b750a79656e5aa261869900d39703f1311df4c63ef415ae443f62295f SDL2_image-2.8.3.tar.gz
5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad SDL2_mixer-2.8.0.tar.gz
34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912 SDL2_ttf-2.22.0.tar.gz
a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885 SDL2_ttf-2.24.0.tar.gz
4 changes: 2 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
)
endif

sdl_ver = (sdl_api == 3) ? '3.1.6' : '2.30.10'
sdl_ver = (sdl_api == 3) ? '3.1.6' : '2.30.11'
sdl_image_ver = (sdl_api == 3) ? '3.1.0' : '2.8.3'
sdl_mixer_ver = '2.8.0'
sdl_ttf_ver = '2.22.0'
sdl_ttf_ver = '2.24.0'

dlls = []

Expand Down
Loading