Merge pull request #3332 from pygame-community/starbuck-dep-updates

Update SDL to 2.32, mixer to 2.8.1

Author: damusss

buildconfig/download_win_prebuilt.py

@@ -78,20 +78,20 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-devel-2.30.12-VC.zip',
-        'e63d904330034ab9e6794eb1f54fe2fb7d21e9f7',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.32.0/SDL2-devel-2.32.0-VC.zip',
+        'e4b39b4b81ca1d3beef1935113c7820e8d3bd307',
         ],
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.2/SDL3-devel-3.2.2-VC.zip',
-        'fabb3c78f7eebf6a877e8f91d17d6dd10a987b27'
+        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-devel-3.2.4-VC.zip',
+        '3576077236c7a66bf98d4b3d180aa4743ad5ce2e'
         ],
         [
         '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/prerelease-3.1.1/SDL3_image-devel-3.1.1-VC.zip',
-        '01f751322e742bb9dd3121d5ef37214c0529cb7c'
+        'https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.0/SDL3_image-devel-3.2.0-VC.zip',
+        '2aebab1f803edfb708622fa4e1afc0afadcf5c8b'
         ],
         [
         'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip',
@@ -102,8 +102,8 @@ def get_urls(x86=True, x64=True):
         '34bb4a03c6f0f6c9de3658bac98adc7029830578'
         ],
         [
-        'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.0/SDL2_mixer-devel-2.8.0-VC.zip',
-        'a10411644e08cd94f29712f430c7b71c407ae76d',
+        'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.1/SDL2_mixer-devel-2.8.1-VC.zip',
+        'ea302368159ca64056b2519b3a624525f625220e',
         ],
     ])
     if x86:
@@ -224,24 +224,24 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3_image-devel-3.1.1-VC/SDL3_image-3.1.1'
+                'SDL3_image-devel-3.2.0-VC/SDL3_image-3.2.0'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3_image-3.1.1'
+                'SDL3_image-3.2.0'
             )
         )
 
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2_mixer-devel-2.8.0-VC/SDL2_mixer-2.8.0'
+                'SDL2_mixer-devel-2.8.1-VC/SDL2_mixer-2.8.1'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2_mixer-2.8.0'
+                'SDL2_mixer-2.8.1'
             )
         )
         copy(
@@ -266,27 +266,26 @@ def copy(src, dst):
                 'SDL3_ttf-3.1.0'
             )
         )
-
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.30.12-VC/SDL2-2.30.12'
+                'SDL2-devel-2.32.0-VC/SDL2-2.32.0'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.30.12'
+                'SDL2-2.32.0'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3-devel-3.2.2-VC/SDL3-3.2.2'
+                'SDL3-devel-3.2.4-VC/SDL3-3.2.4'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3-3.2.2'
+                'SDL3-3.2.4'
             )
         )
 

buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh

@@ -3,13 +3,13 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.30.12"
+SDL2_VER="2.32.0"
 SDL2="SDL2-$SDL2_VER"
 IMG2_VER="2.8.4"
 IMG2="SDL2_image-$IMG2_VER"
 TTF2_VER="2.24.0"
 TTF2="SDL2_ttf-$TTF2_VER"
-MIX2_VER="2.8.0"
+MIX2_VER="2.8.1"
 MIX2="SDL2_mixer-$MIX2_VER"
 
 

buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512

@@ -1,4 +1,4 @@
-358dc9aabebdd1242245183a76d1ddff7b312f3db1f9fd247a7bd444bc8ca4c49e36a5a02bc577f2ee0b1f38f06f85b35a3db3616fdc9a6c67cd066db5152ac7  SDL2-2.30.12.tar.gz
+a91b8105125f06118e8bfce2a5553fe053f7158dd02f06a36cfc535f09c401eb7da11072e576c6bf6e41fa2e02b08483b9cc4e11c658578b762e1b6c326a45bb  SDL2-2.32.0.tar.gz
 a4b7436442be43b96dc7b90c9badd011da1622e283ae068b82367fcb72b7dd7a0357aec5550fe44103a77da75b8c570d5204fff11a805373f2194f92b8f71343  SDL2_image-2.8.4.tar.gz
-5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad  SDL2_mixer-2.8.0.tar.gz
+6148591404b2113bcdb54391821658548acfe380a9cba660113e55e6f2fb7da2a5a59a99fefe51a0d7f8b91160648f11f72750353da88d285a962e3a410aecd7  SDL2_mixer-2.8.1.tar.gz
 a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885  SDL2_ttf-2.24.0.tar.gz

meson.build

@@ -109,9 +109,9 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
         )
     endif
 
-    sdl_ver = (sdl_api == 3) ? '3.2.2' : '2.30.12'
-    sdl_image_ver = (sdl_api == 3) ? '3.1.1' : '2.8.4'
-    sdl_mixer_ver = '2.8.0'
+    sdl_ver = (sdl_api == 3) ? '3.2.4' : '2.32.0'
+    sdl_image_ver = (sdl_api == 3) ? '3.2.0' : '2.8.4'
+    sdl_mixer_ver = '2.8.1'
     sdl_ttf_ver = (sdl_api == 3) ? '3.1.0' : '2.24.0'
 
     dlls = []