From 395e9bc47051d4b03ed2dfa142239051a1374d56 Mon Sep 17 00:00:00 2001 From: Ankith Date: Sat, 4 Jan 2025 10:07:21 +0530 Subject: [PATCH 1/2] Bump SDL_ttf to 2.24.0 --- buildconfig/download_win_prebuilt.py | 8 ++++---- .../docker_base/sdl_libs/build-sdl2-libs.sh | 2 +- .../manylinux-build/docker_base/sdl_libs/sdl2.sha512 | 2 +- meson.build | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildconfig/download_win_prebuilt.py b/buildconfig/download_win_prebuilt.py index 9c56e007f6..dae15321bf 100644 --- a/buildconfig/download_win_prebuilt.py +++ b/buildconfig/download_win_prebuilt.py @@ -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', @@ -243,12 +243,12 @@ 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( diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh index 7d6da64605..76b657e542 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh @@ -7,7 +7,7 @@ SDL2_VER="2.30.10" 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" diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 index 8d171a1031..ee397a928c 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 @@ -1,4 +1,4 @@ bcb220749cd3b0874288d617419e622701138bcb8fe55e9b665e8843c65afda031d01afe0d11e308a9608724ed151f342e5f5670c84204b36943cb323ced41da SDL2-2.30.10.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 diff --git a/meson.build b/meson.build index 7b8017c390..8bbd62d606 100644 --- a/meson.build +++ b/meson.build @@ -112,7 +112,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86') sdl_ver = (sdl_api == 3) ? '3.1.6' : '2.30.10' 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 = [] From 8454447641aa9d7f183606b3c3468ee2513ca9df Mon Sep 17 00:00:00 2001 From: Ankith Date: Sat, 4 Jan 2025 10:10:55 +0530 Subject: [PATCH 2/2] Bump SDL to 2.30.11 --- buildconfig/download_win_prebuilt.py | 8 ++++---- .../docker_base/sdl_libs/build-sdl2-libs.sh | 2 +- .../manylinux-build/docker_base/sdl_libs/sdl2.sha512 | 2 +- meson.build | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildconfig/download_win_prebuilt.py b/buildconfig/download_win_prebuilt.py index dae15321bf..1619ae96c2 100644 --- a/buildconfig/download_win_prebuilt.py +++ b/buildconfig/download_win_prebuilt.py @@ -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', @@ -254,12 +254,12 @@ def copy(src, dst): 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( diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh index 76b657e542..4c41b99ff5 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh @@ -3,7 +3,7 @@ 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" diff --git a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 index ee397a928c..4da6b68171 100644 --- a/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 +++ b/buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512 @@ -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 a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885 SDL2_ttf-2.24.0.tar.gz diff --git a/meson.build b/meson.build index 8bbd62d606..5fc582a4c0 100644 --- a/meson.build +++ b/meson.build @@ -109,7 +109,7 @@ 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.24.0'