Merge pull request #3034 from pygame-community/oddbookworm-SDL-2.30.6

ankith26 · web-flow · commit d8ea99c8e0b0 · 2024-08-05T12:31:34.000+05:30
Update SDL to 2.30.6
diff --git 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.5/SDL2-devel-2.30.5-VC.zip',
-        '035842a7061f3ab4f9d469bab9a3874587a07c74',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-VC.zip',
+        '038ffed56e04fbc4c6236187472c671596963fdb',
         ],
         [
         'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',
@@ -234,12 +234,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.30.5-VC/SDL2-2.30.5'
+                'SDL2-devel-2.30.6-VC/SDL2-2.30.6'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.30.5'
+                'SDL2-2.30.6'
             )
         )
 
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.5"
+SDL2_VER="2.30.6"
 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 @@
-a5892d96e4bd97702aacaddebef16c0d731582539ef3eb4cf95494b81fcda2305e93ac0735074d6269833efd106b4ae194b964ef5696476d071e071ba22aadc4  SDL2-2.30.5.tar.gz
+c73fd0b52e77d248a5dc2808a660ded9e708b87f68f677970da71e9b4a25ec60cf52f319b8b014ced7c9363560f2360262c04551a895f0f83ee62c3feeafba47  SDL2-2.30.6.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
@@ -86,7 +86,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
         )
     endif
 
-    sdl_ver = '2.30.5'
+    sdl_ver = '2.30.6'
     sdl_image_ver = '2.8.2'
     sdl_mixer_ver = '2.8.0'
     sdl_ttf_ver = '2.22.0'

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):`
`78`	`78`	`url_sha1 = []`
`79`	`79`	`url_sha1.extend([`
`80`	`80`	`[`
`81`		`- 'https://github.com/libsdl-org/SDL/releases/download/release-2.30.5/SDL2-devel-2.30.5-VC.zip',`
`82`		`- '035842a7061f3ab4f9d469bab9a3874587a07c74',`
	`81`	`+ 'https://github.com/libsdl-org/SDL/releases/download/release-2.30.6/SDL2-devel-2.30.6-VC.zip',`
	`82`	`+ '038ffed56e04fbc4c6236187472c671596963fdb',`
`83`	`83`	`],`
`84`	`84`	`[`
`85`	`85`	`'https://github.com/pygame-community/SDL_image/releases/download/2.8.2-pgce/SDL2_image-devel-2.8.2-VCpgce.zip',`
`@@ -234,12 +234,12 @@ def copy(src, dst):`
`234`	`234`	`copy(`
`235`	`235`	`os.path.join(`
`236`	`236`	`temp_dir,`
`237`		`- 'SDL2-devel-2.30.5-VC/SDL2-2.30.5'`
	`237`	`+ 'SDL2-devel-2.30.6-VC/SDL2-2.30.6'`
`238`	`238`	`),`
`239`	`239`	`os.path.join(`
`240`	`240`	`move_to_dir,`
`241`	`241`	`prebuilt_dir,`
`242`		`- 'SDL2-2.30.5'`
	`242`	`+ 'SDL2-2.30.6'`
`243`	`243`	`)`
`244`	`244`	`)`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')`
`86`	`86`	`)`
`87`	`87`	`endif`
`88`	`88`
`89`		`- sdl_ver = '2.30.5'`
	`89`	`+ sdl_ver = '2.30.6'`
`90`	`90`	`sdl_image_ver = '2.8.2'`
`91`	`91`	`sdl_mixer_ver = '2.8.0'`
`92`	`92`	`sdl_ttf_ver = '2.22.0'`