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 SDL2_image and SDL3 prerelease #3286

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Bump SDL2_image and SDL3 prerelease #3286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -82,12 +82,12 @@ def get_urls(x86=True, x64=True):
'163e3300a1450e6e7d4fff0d35b039c3eae44e79',
],
[
'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.6/SDL3-devel-3.1.6-VC.zip',
'7a3b9ed85cfe735c7e106d98c4b6395a113e5d7e'
'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.8/SDL3-devel-3.1.8-VC.zip',
'6b17cd6414d8f42b43a6006ddb2b40fd4c3b7c7b'
],
[
'https://github.com/pygame-community/SDL_image/releases/download/2.8.3-pgce/SDL2_image-devel-2.8.3-VCpgce.zip',
'71ad2b5aacbc934a39e390ad733421313dd5d059'
'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
'b9b4a5d44cab57901003255a1c1f98a42282762b'
],
[
'https://github.com/libsdl-org/SDL_image/releases/download/preview-3.1.0/SDL3_image-devel-3.1.0-VC.zip',
Expand Down Expand Up @@ -209,12 +209,12 @@ def copy(src, dst):
copy(
os.path.join(
temp_dir,
'SDL2_image-devel-2.8.3-VCpgce/SDL2_image-2.8.3'
'SDL2_image-devel-2.8.4-VCpgce/SDL2_image-2.8.4'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2_image-2.8.3'
'SDL2_image-2.8.4'
)
)
copy(
Expand Down Expand Up @@ -265,12 +265,12 @@ def copy(src, dst):
copy(
os.path.join(
temp_dir,
'SDL3-devel-3.1.6-VC/SDL3-3.1.6'
'SDL3-devel-3.1.8-VC/SDL3-3.1.8'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL3-3.1.6'
'SDL3-3.1.8'
)
)

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 @@ -5,7 +5,7 @@ cd $(dirname `readlink -f "$0"`)

SDL2_VER="2.30.11"
SDL2="SDL2-$SDL2_VER"
IMG2_VER="2.8.3"
IMG2_VER="2.8.4"
IMG2="SDL2_image-$IMG2_VER"
TTF2_VER="2.24.0"
TTF2="SDL2_ttf-$TTF2_VER"
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 @@
cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 SDL2-2.30.11.tar.gz
b49e466494a4bebcacc09e3fe2afbe5edbae636c007cd26e7e04301bf8fe54db6751258b750a79656e5aa261869900d39703f1311df4c63ef415ae443f62295f SDL2_image-2.8.3.tar.gz
a4b7436442be43b96dc7b90c9badd011da1622e283ae068b82367fcb72b7dd7a0357aec5550fe44103a77da75b8c570d5204fff11a805373f2194f92b8f71343 SDL2_image-2.8.4.tar.gz
5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad SDL2_mixer-2.8.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,8 +109,8 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
)
endif

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

Expand Down
Loading