Update SDL2 bindings to 2.0.20 (#214)

* Update bindings to SDL 2.0.20

* Update CI to use 2.0.20 binaries

* Updated news.rst

Author: a-hurst

.ci/getsdl2.py

@@ -25,6 +25,13 @@
 }
 
 libversions = {
+    '2.0.20': {
+        'SDL2': '2.0.20',
+        'SDL2_mixer': '2.0.4',
+        'SDL2_ttf': '2.0.18',
+        'SDL2_image': '2.0.5',
+        'SDL2_gfx': '1.0.4'
+    },
     '2.0.18': {
         'SDL2': '2.0.18',
         'SDL2_mixer': '2.0.4',

.github/workflows/run_tests.yml

@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
-        sdl2: ['2.0.18']
+        sdl2: ['2.0.20']
         name-prefix: ['Linux (Python ']
         include:
           - python-version: 'pypy-2.7'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'Experimental / Linux ('
           - python-version: 'pypy-3.7'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'Experimental / Linux ('
 
     env:
@@ -71,11 +71,11 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.9]
-        sdl2: ['2.0.18', '2.0.16', '2.0.14']
+        sdl2: ['2.0.20', '2.0.16', '2.0.14']
         name-prefix: ['macOS (Python ']
         include:
           - python-version: '2.7'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'macOS (Python '
           - python-version: '3.9'
             sdl2: 'from Homebrew'
@@ -127,20 +127,21 @@ jobs:
       matrix:
         python-version: [3.9]
         architecture: ['x64']
-        sdl2: ['2.0.18', '2.0.16', '2.0.14', '2.0.12', '2.0.10', '2.0.9', '2.0.8', '2.0.7', '2.0.6', '2.0.5']
+        sdl2: ['2.0.20', '2.0.18', '2.0.16', '2.0.14', '2.0.12',
+              '2.0.10', '2.0.9', '2.0.8', '2.0.7', '2.0.6', '2.0.5']
         name-prefix: ['Windows (Python ']
         include:
           - python-version: '2.7'
             architecture: 'x64'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'Windows (Python '
           - python-version: '2.7'
             architecture: 'x86'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'Windows 32-bit (Python '
           - python-version: '3.9'
             architecture: 'x86'
-            sdl2: '2.0.18'
+            sdl2: '2.0.20'
             name-prefix: 'Windows 32-bit (Python '
           - python-version: '2.7'
             architecture: 'x86'

doc/news.rst

@@ -2,6 +2,16 @@ Release News
 ============
 This describes the latest changes between the PySDL2 releases.
 
+0.9.11
+------
+
+Released on XXXX-XX-XX.
+
+New Features:
+
+* Updated to wrap new functions and constants in SDL2 2.0.20 (PR #214)
+
+
 0.9.10
 ------
 
@@ -14,7 +24,7 @@ New Features:
   allows functions to support kwargs (i.e. using function arguments by name),
   inline documentation, and more flexible handling of argument types and
   SDL errors (PR #199)
-* Updated to wrap new functions and constants in in SDL2 2.0.18 (PR #197)
+* Updated to wrap new functions and constants in SDL2 2.0.18 (PR #197)
 * Added full inline documentation for the :mod:`~sdl2.sdlttf`,
   :mod:`~sdl2.sdlimage`, and :mod:`~sdl2.sdlgfx` modules, as well as partial
   inline documentation for the :mod:`~sdl2.sdlmixer` modlue. In addition to
@@ -154,7 +164,7 @@ Released on 2021-09-02.
 
 New Features:
 
-* Updated to wrap new functions and constants in in SDL2 2.0.16 (PR #190)
+* Updated to wrap new functions and constants in SDL2 2.0.16 (PR #190)
 
 Fixed bugs:
 
@@ -169,7 +179,7 @@ Released on 2021-08-06.
 
 New Features:
 
-* Updated to wrap new functions and constants in introduced in SDL2 2.0.12
+* Updated to wrap new functions and constants introduced in SDL2 2.0.12
   and 2.0.14 (PR #163 & PR #181)
 * Fixed DLL loading issues with Python installed from the Microsoft Store
   on Windows (PR #185)

sdl2/__init__.py

@@ -1,5 +1,4 @@
 """SDL2 wrapper package"""
-from __future__ import absolute_import
 from .dll import get_dll_file, _bind
 from ctypes import c_int as _cint
 

sdl2/hints.py

@@ -98,8 +98,8 @@
     "SDL_HINT_AUDIO_DEVICE_STREAM_ROLE", "SDL_HINT_AUDIO_INCLUDE_MONITORS",
     "SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED",
     "SDL_HINT_PREFERRED_LOCALES", "SDL_HINT_APP_NAME",
-    "SDL_HINT_RENDER_BATCHING", "SDL_HINT_EVENT_LOGGING",
-    "SDL_HINT_POLL_SENTINEL",
+    "SDL_HINT_RENDER_BATCHING", "SDL_HINT_RENDER_LINE_METHOD",
+    "SDL_HINT_EVENT_LOGGING", "SDL_HINT_POLL_SENTINEL",
     "SDL_HINT_WAVE_RIFF_CHUNK_SIZE", "SDL_HINT_WAVE_TRUNCATION",
     "SDL_HINT_WAVE_FACT_CHUNK", "SDL_HINT_DISPLAY_USABLE_BOUNDS",
     "SDL_HINT_VIDEO_DOUBLE_BUFFER", "SDL_HINT_VIDEO_EGL_ALLOW_TRANSPARENCY",
@@ -257,6 +257,7 @@
 SDL_HINT_APP_NAME = b"SDL_APP_NAME"
 SDL_HINT_PREFERRED_LOCALES = b"SDL_PREFERRED_LOCALES"
 SDL_HINT_RENDER_BATCHING  = b"SDL_RENDER_BATCHING"
+SDL_HINT_RENDER_LINE_METHOD = b"SDL_RENDER_LINE_METHOD"
 SDL_HINT_EVENT_LOGGING = b"SDL_EVENT_LOGGING"
 SDL_HINT_POLL_SENTINEL = b"SDL_POLL_SENTINEL"
 SDL_HINT_WAVE_RIFF_CHUNK_SIZE = b"SDL_WAVE_RIFF_CHUNK_SIZE"

sdl2/render.py

@@ -232,7 +232,7 @@ class SDL_Texture(c_void_p):
 SDL_RenderCopyF = _bind("SDL_RenderCopyF", [POINTER(SDL_Renderer), POINTER(SDL_Texture), POINTER(SDL_Rect), POINTER(SDL_FRect)], c_int, added='2.0.10')
 SDL_RenderCopyExF = _bind("SDL_RenderCopyExF", [POINTER(SDL_Renderer), POINTER(SDL_Texture), POINTER(SDL_Rect), POINTER(SDL_FRect), c_double, POINTER(SDL_FPoint), SDL_RendererFlip], c_int, added='2.0.10')
 SDL_RenderGeometry = _bind("SDL_RenderGeometry", [POINTER(SDL_Renderer), POINTER(SDL_Texture), POINTER(SDL_Vertex), c_int, POINTER(c_int), c_int], c_int, added='2.0.18')
-SDL_RenderGeometryRaw = _bind("SDL_RenderGeometryRaw", [POINTER(SDL_Renderer), POINTER(SDL_Texture), POINTER(c_float), c_int, POINTER(c_int), c_int, POINTER(c_float), c_int, c_int, c_void_p, c_int, c_int], c_int, added='2.0.18')
+SDL_RenderGeometryRaw = _bind("SDL_RenderGeometryRaw", [POINTER(SDL_Renderer), POINTER(SDL_Texture), POINTER(c_float), c_int, POINTER(SDL_Color), c_int, POINTER(c_float), c_int, c_int, c_void_p, c_int, c_int], c_int, added='2.0.18')
 SDL_RenderReadPixels = _bind("SDL_RenderReadPixels", [POINTER(SDL_Renderer), POINTER(SDL_Rect), Uint32, c_void_p, c_int], c_int)
 SDL_RenderPresent = _bind("SDL_RenderPresent", [POINTER(SDL_Renderer)])
 SDL_DestroyTexture = _bind("SDL_DestroyTexture", [POINTER(SDL_Texture)])

sdl2/test/render_test.py

@@ -944,15 +944,15 @@ def test_SDL_RenderGeometry(self):
     def test_SDL_RenderGeometryRaw(self):
         renderer, target = _software_renderer(100, 100)
         # Create vertices for rendering
-        RED = [255, 0, 0, 255]
+        RED = SDL_Color(255, 0, 0, 255)
         points = [0, 0, 0, 50, 50, 50]
-        colors = RED * 3
+        colors = [RED, RED, RED]
         tex_coords = [0, 0, 0, 0, 0, 0]
         # Convert vertices to ctypes-friendly format
         xy_size = sizeof(c_float) * 2
-        col_size = sizeof(ctypes.c_ubyte) * 4
+        col_size = sizeof(SDL_Color)
         xy = (c_float * len(points))(*points)
-        col = (c_int * len(colors))(*colors)
+        col = (SDL_Color * len(colors))(*colors)
         uv = (c_float * len(tex_coords))(*tex_coords)
         # Try rendering the vertices
         ret = render.SDL_RenderGeometryRaw(

sdl2/version.py

@@ -26,7 +26,7 @@ class SDL_version(Structure):
 
 SDL_MAJOR_VERSION = 2
 SDL_MINOR_VERSION = 0
-SDL_PATCHLEVEL = 18
+SDL_PATCHLEVEL = 20
 
 def SDL_VERSION(x):
     x.major = SDL_MAJOR_VERSION