Merge branch 'main' into support-sdlwindowid

Author: yunline

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/build-debian-multiarch.yml

@@ -50,7 +50,7 @@ jobs:
     - uses: actions/[email protected]
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v2.3.0
+      uses: uraimo/run-on-arch-action@v2.5.0
       id: build
       with:
         arch: ${{ matrix.arch }}

.github/workflows/build-macos.yml

@@ -149,7 +149,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.3.0
 
       - name: pip cache
         uses: actions/[email protected]
@@ -165,7 +165,7 @@ jobs:
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
 
       - name: Build and test wheels
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/build-manylinux.yml

@@ -82,7 +82,7 @@ jobs:
     - uses: actions/[email protected]
 
     - name: Log in to the Container registry
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -95,14 +95,14 @@ jobs:
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
       with:
         images: ghcr.io/${{ github.repository }}_${{ matrix.arch }}
         tags: type=raw,value=${{ hashFiles('buildconfig/manylinux-build/**') }}
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -118,7 +118,7 @@ jobs:
         CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
 
-      uses: pypa/[email protected].0
+      uses: pypa/[email protected].1
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-ubuntu-sdist.yml

@@ -57,7 +57,6 @@ jobs:
       # install numpy from pip and not apt because the one from pip is newer,
       # and has typestubs
       run: |
-        sudo apt-mark hold grub-efi-amd64-signed
         sudo apt-get update --fix-missing
         sudo apt-get upgrade
         sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev

.github/workflows/cppcheck.yml

@@ -26,7 +26,6 @@ jobs:
 
       - name: Install deps
         run: |
-          sudo apt-mark hold grub-efi-amd64-signed
           sudo apt-get update --fix-missing
           sudo apt-get upgrade
           sudo apt install cppcheck

.gitignore

@@ -1,4 +1,4 @@
-# Pygame build process: config.py setup.py
+# pygame-ce build process: config.py setup.py
 /Setup
 *.pyc
 /build/
@@ -35,6 +35,7 @@
 # Other
 envdev*
 .virtualenv*
+*venv*
 buildconfig/manylinux-build/wheelhouse/
 anenv
 dist

README.rst

@@ -3,6 +3,7 @@
   :target: https://pyga.me/
 
 
+|DocsStatus| 
 |PyPiVersion| |PyPiLicense|
 |Python3| |GithubCommits| |BlackFormatBadge|
 
@@ -178,9 +179,12 @@ See docs/licenses for licenses of dependencies.
 
 .. |Python3| image:: https://img.shields.io/badge/python-3-blue.svg?v=1
 
-.. |GithubCommits| image:: https://img.shields.io/github/commits-since/pygame-community/pygame-ce/2.1.3.svg
-   :target: https://github.com/pygame-community/pygame-ce/compare/2.1.3...main
+.. |GithubCommits| image:: https://img.shields.io/github/commits-since/pygame-community/pygame-ce/2.1.4.svg
+   :target: https://github.com/pygame-community/pygame-ce/compare/2.1.4...main
 
+.. |DocsStatus| image:: https://img.shields.io/website?down_message=offline&label=docs&up_message=online&url=https%3A%2F%2Fpyga.me%2Fdocs%2F
+   :target: https://pyga.me/docs/
+   
 .. |BlackFormatBadge| image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :target: https://github.com/psf/black
 

buildconfig/Setup.Emscripten.SDL2.in

@@ -42,7 +42,7 @@ image src_c/void.c
 base src_c/void.c
 bufferproxy src_c/void.c
 color src_c/void.c
-controller src_c/void.c
+controller_old src_c/void.c
 display src_c/void.c
 draw src_c/void.c
 event src_c/void.c
@@ -60,9 +60,10 @@ surface src_c/void.c
 surflock src_c/void.c
 rect src_c/void.c
 rwobject src_c/void.c
+system src_c/void.c
 
 #_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/void.c
+_sdl2.controller_old src_c/void.c
 
 #_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.touch src_c/void.c

buildconfig/Setup.SDL2.in

@@ -37,7 +37,7 @@ _sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
 _sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.controller_old src_c/_sdl2/controller_old.c $(SDL) $(DEBUG) -Isrc_c
 
 GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
 #GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
@@ -74,3 +74,4 @@ pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
 math src_c/math.c $(SDL) $(DEBUG)
 pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
+system src_c/system.c $(SDL) $(DEBUG)