Fix _sdl2.controller bug on old SDL versions

pygame · Nov 6, 2021 · 50c4f87 · 50c4f87
1 parent d6291ab
commit 50c4f87
Show file tree

Hide file tree

Showing 9 changed files with 4,020 additions and 3,179 deletions.
diff --git a/.github/workflows/manylinux.yml b/.github/workflows/manylinux.yml
@@ -33,14 +33,14 @@ jobs:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         arch: ['x64', 'x86', 'aarch64']
-        tag: ['-manylinux1-', '-manylinux2010-', -manylinux2014-]
+        tag: ['manylinux1', 'manylinux2010', 'manylinux2014']
 
         exclude:
           # aarch64 only with manylinux2014 for now
           - arch: 'aarch64'
-            tag: '-manylinux1-'
+            tag: 'manylinux1'
           - arch: 'aarch64'
-            tag: '-manylinux2010-'
+            tag: 'manylinux2010'
 
     steps:
     - uses: actions/checkout@v2.3.4
@@ -54,7 +54,7 @@ jobs:
     - name: Build manylinux wheels
       run: |
         cd buildconfig/manylinux-build
-        make pull${{ matrix.tag }}${{ matrix.arch }} wheels${{ matrix.tag }}${{ matrix.arch }}
+        make pull-${{ matrix.tag }}-${{ matrix.arch }} wheels-${{ matrix.tag }}-${{ matrix.arch }}
         cd ../..
         mkdir -p dist/
         cp buildconfig/manylinux-build/wheelhouse/*.whl dist/

diff --git a/.github/workflows/ubuntu-sdist.yml b/.github/workflows/ubuntu-sdist.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Make sdist and install it
       run: |
         python3 setup.py sdist
-        pip3 install dist/pygame-*.tar.gz
+        pip3 install dist/pygame-*.tar.gz -vv
 
     - name: Run tests
       env:

diff --git a/src_c/_sdl2/controller.c b/src_c/_sdl2/controller.c
diff --git a/src_c/_sdl2/sdl2.c b/src_c/_sdl2/sdl2.c
diff --git a/src_c/_sdl2/video.c b/src_c/_sdl2/video.c