Merge pull request #3203 from pygame-community/ankith26-sdl-bump

Bump SDL2 to 2.30.9 and SDL3 to 3.1.6
pygame-community · Nov 2, 2024 · 5e57805 · 5e57805
2 parents 4f587cc + 979390d
commit 5e57805
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/buildconfig/download_win_prebuilt.py b/buildconfig/download_win_prebuilt.py
@@ -78,12 +78,12 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-devel-2.30.8-VC.zip',
-        '389a7575afaeccd3586a8105520cbec46b930dcb',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.9/SDL2-devel-2.30.9-VC.zip',
+        'd89a2ad46b98ba08db5ec5877cb2fde46e127825',
         ],
         [
-        'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.3/SDL3-devel-3.1.3-VC.zip',
-        '8e4d7104193ba976406fe9968301de6f6b57f342'
+        'https://github.com/libsdl-org/SDL/releases/download/preview-3.1.6/SDL3-devel-3.1.6-VC.zip',
+        '7a3b9ed85cfe735c7e106d98c4b6395a113e5d7e'
         ],
         [
         'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
@@ -238,23 +238,23 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.30.8-VC/SDL2-2.30.8'
+                'SDL2-devel-2.30.9-VC/SDL2-2.30.9'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.30.8'
+                'SDL2-2.30.9'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3-devel-3.1.3-VC/SDL3-3.1.3'
+                'SDL3-devel-3.1.6-VC/SDL3-3.1.6'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3-3.1.3'
+                'SDL3-3.1.6'
             )
         )
 

diff --git a/buildconfig/macdependencies/clean_usr_local.sh b/buildconfig/macdependencies/clean_usr_local.sh
@@ -15,6 +15,7 @@ ln -s /usr/bin/git /opt/homebrew/bin/git
 rm -rf /usr/local/lib/libtiff*
 rm -rf /usr/local/lib/libzstd*
 rm -rf /usr/local/lib/libwebp*
+rm -rf /usr/local/lib/libdeflate*
 rm -rf /usr/local/lib/libsndfile*
 rm -rf /usr/local/lib/glib*
 rm -rf /usr/local/lib/libglib*
@@ -27,6 +28,7 @@ rm -rf /usr/local/opt/freetype*
 
 rm -rf /usr/local/Cellar/libtiff /opt/homebrew/Cellar/libtiff
 rm -rf /usr/local/Cellar/libsndfile /opt/homebrew/Cellar/libsndfile
+rm -rf /usr/local/Cellar/libdeflate* /opt/homebrew/Cellar/libdeflate*
 rm -rf /usr/local/Cellar/glib /opt/homebrew/Cellar/glib
 rm -rf /usr/local/Cellar/brotli /opt/homebrew/Cellar/brotli
 rm -rf /usr/local/Cellar/pcre* /opt/homebrew/Cellar/pcre*

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
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.30.8"
+SDL2_VER="2.30.9"
 SDL2="SDL2-$SDL2_VER"
 IMG2_VER="2.8.2"
 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
@@ -1,4 +1,4 @@
-72e49d8a67f5ca1241a262e7e7ae7f6ff148e8774343110db652589ab2e72d3425534ca7f8c7825b2ae1afc779c09228da33a9586219ac4e53546a4930380b64  SDL2-2.30.8.tar.gz
+30dfa86fcced174fef0ed78ffa53476a31765e19cdcdf8233ab92876445b4dedaa758fc42a3ec332324d13faa2daafcadcc44fc0f536a2969ef836162ec3cd36  SDL2-2.30.9.tar.gz
 0ff345824f95158dfa72f83f9d4a540601c178cd759334bf849c14a2920b5330d0763413b58c08b3deba8d3a4ccb6ea2a8159f87efe4cbb0e8ea850f63d09454  SDL2_image-2.8.2.tar.gz
 5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad  SDL2_mixer-2.8.0.tar.gz
 34a1d210d8f1b1e802139d65ba47e36033bb7881e75a8862c1b1c515565bef85e3d81ee42e952aa664de043debef387ba60088a9cf3ba3297413db39a13af912  SDL2_ttf-2.22.0.tar.gz
diff --git 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.3' : '2.30.8'
+    sdl_ver = (sdl_api == 3) ? '3.1.6' : '2.30.9'
     sdl_image_ver = '2.8.2'
     sdl_mixer_ver = '2.8.0'
     sdl_ttf_ver = '2.22.0'