Merge pull request #2318 from pygame-community/2.26.5

Move to SDL 2.26.5

Author: ankith26

.github/workflows/build-macos.yml

@@ -89,36 +89,31 @@ jobs:
             macarch: x86_64,
             # pattern matches any 2 digit number
             pyversions: "cp3[1-9][0-9]-*",
-            cibw_platform: "macosx-10.11-x86_64"
           }
 
           - { 
             name: "x86_64 (Python 3.7)",
             macarch: x86_64,
             pyversions: "?p37-*",
-            cibw_platform: "macosx-10.11-x86_64"
           }
 
           - { 
             name: "x86_64 (Python 3.8)",
             macarch: x86_64,
             pyversions: "?p38-*",
-            cibw_platform: "macosx-10.11-x86_64"
           }
 
           - { 
             name: "x86_64 (Python 3.9)",
             macarch: x86_64,
             pyversions: "?p39-*",
-            cibw_platform: "macosx-10.11-x86_64"
           }
 
           - { 
             name: "arm64 (CPython 3.8 and above)",
             macarch: arm64,
             # pattern matches any number from 8 to 99
             pyversions: "cp3{8,9,[1-9][0-9]}-*",
-            cibw_platform: "macosx-11.0-arm64"
           }
 
     env:
@@ -128,9 +123,16 @@ jobs:
       # also define environment variables needed for testing
       CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
 
-      # Tell CIBW that the wheel should be for 10.11
+      # Explicitly tell CIBW what the wheel arch deployment target should be
+      # There seems to be no better way to set this than this env
+      # We need this because our minimum is 10.11, different from default
+      # of 10.9 on x86s
       # Related issue: https://github.com/pypa/cibuildwheel/issues/952
-      _PYTHON_HOST_PLATFORM: ${{ matrix.cibw_platform }}
+      _PYTHON_HOST_PLATFORM: ${{ matrix.macarch == 'x86_64' && 'macosx-10.11-x86_64' || 'macosx-11.0-arm64'}}
+
+      # Similarly, we need to tell CIBW that the wheel's linking steps
+      # should be for 10.11 on x86
+      MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macarch == 'x86_64' && '10.11' || '11.0' }}
 
       CIBW_BUILD: ${{ matrix.pyversions }}
 

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.26.4/SDL2-devel-2.26.4-VC.zip',
-        '0dea77fd5ead8c1a2134af3fc256578327e25879',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.26.5/SDL2-devel-2.26.5-VC.zip',
+        'f040c352af677161200ec07463efe8d1325135e4',
         ],
         [
         'https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.5-VC.zip',
@@ -234,12 +234,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.26.4-VC/SDL2-2.26.4'
+                'SDL2-devel-2.26.5-VC/SDL2-2.26.5'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.26.4'
+                'SDL2-2.26.5'
             )
         )
 

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

@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2="SDL2-2.26.4"
+SDL2="SDL2-2.26.5"
 IMG2="SDL2_image-2.0.5"
 TTF2="SDL2_ttf-2.20.2"
 MIX2="SDL2_mixer-2.6.2"

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

@@ -1,4 +1,4 @@
-138f52a23d796803c450722c8a4db8226214522e99f1e5ae657e2b28eb45abf0c81c9c3df9ab16f1a07d59722ed9415d64dd04332ff040cdfbbc0329f0d05ce4  SDL2-2.26.4.tar.gz
+0f37b443950bc89c3f3add2fc9a9970f42b47e933c106a1d676d1715c520125d5725ffcb9ff85bcf66ac3ff78d9d43d994f9c1935b7c0fd7951e10e251936bcc  SDL2-2.26.5.tar.gz
 77e743d3f32707e015b290c1379ae3c7d7a3fe265995713267f0d0ec6517de4808f0de9890b5ab28445941af5bc9fbff346620629e0d7d7e9f365262cab05ee7  SDL2_image-2.0.5.tar.gz
 16baa9d8b345bf0224538cbfb2ae9fc5d3deea2b454f41a98006c938fe7a65d5a8c84e28a76f98a4dd971c4fe5cf0219d8bf73331cf11f2702e01600eb197658  SDL2_mixer-2.6.2.tar.gz
 b54e93b100712e3764cd80d4e4b16cd4c2a6853620f675941a4214320b0ee29a583d57ad56cd5fdb5c7a32d7615cbf43bc3fa55337b01623cee7219ebb43667c  SDL2_ttf-2.20.2.tar.gz