Merge branch 'main' of https://github.com/pygame-community/pygame-ce into update-prompt-with-freethreading-info

oddbookworm · oddbookworm · commit bf3355643893 · 2025-08-17T08:54:00.000-05:00
diff --git a/.github/workflows/build-debian-multiarch.yml b/.github/workflows/build-debian-multiarch.yml
@@ -121,7 +121,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - name: Download all multiarch artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: pygame-multiarch-armv7-dist
         path: ~/artifacts
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is
@@ -99,14 +99,14 @@ jobs:
       - uses: actions/checkout@v4.2.2
 
       - name: pip cache
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
         with:
           path: ~/Library/Caches/pip  # This cache path is only right on mac
           key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}
 
       - name: Fetch Mac deps
         id: macdep-cache
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
@@ -115,7 +115,7 @@ jobs:
       - name: Install uv for speed
         uses: astral-sh/setup-uv@v6
         with:
-          version: "0.5.26"
+          version: "0.8.3"
 
       - name: Build and test wheels
         uses: pypa/cibuildwheel@v3.1.3
diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml
@@ -36,7 +36,7 @@ jobs:
     - uses: actions/checkout@v4.2.2
 
     - name: Log in to the Container registry
-      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+      uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Install uv for speed
         uses: astral-sh/setup-uv@v6
         with:
-          version: "0.5.26"
+          version: "0.8.3"
 
       - name: Build and test wheels
         uses: pypa/cibuildwheel@v3.1.3
diff --git a/.github/workflows/release-gh-draft.yml b/.github/workflows/release-gh-draft.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4.2.2
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           path: pygame-wheels
           merge-multiple: true
diff --git a/.github/workflows/run-ubuntu-checks.yml b/.github/workflows/run-ubuntu-checks.yml
@@ -88,7 +88,7 @@ jobs:
 
     - name: Cache debug python build
       id: cache-python
-      uses: actions/cache@v4.2.3
+      uses: actions/cache@v4.2.4
       with:
         key: ${{ matrix.python }}
         path: ~/.pyenv/versions/${{ matrix.python }}-debug/**
diff --git a/buildconfig/macdependencies/build_mac_deps.sh b/buildconfig/macdependencies/build_mac_deps.sh
@@ -65,6 +65,9 @@ cd ../manylinux-build/docker_base
 # install some buildtools
 bash buildtools/install.sh
 
+# sdl dep
+bash libsamplerate/build-libsamplerate.sh
+
 # sdl_image deps
 bash zlib-ng/build-zlib-ng.sh
 bash libpng/build-png.sh # depends on zlib
diff --git a/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512 b/buildconfig/manylinux-build/docker_base/alsa/alsa.sha512
@@ -1 +1 @@
-b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0  alsa-lib-1.2.13.tar.bz2
+2716cc3a2299da4a1a170d734af082d78dc452b253179d0f1a9ec190140734aecf002b6924eec4ff2699ce88ce1ae5c56821c267f36384910984db726d1f9626  alsa-lib-1.2.14.tar.bz2
diff --git a/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh b/buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-ALSA=alsa-lib-1.2.13
+ALSA=alsa-lib-1.2.14
 curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2
 sha512sum -c alsa.sha512
 
diff --git a/buildconfig/manylinux-build/docker_base/buildtools/install.sh b/buildconfig/manylinux-build/docker_base/buildtools/install.sh
@@ -17,7 +17,7 @@ fi
 
 # pin versions for stability (remember to keep updated)
 python3 -m pip install $PG_PIP_EXTRA_FLAGS \
-    setuptools==75.8.0 cmake==3.31.4 meson==1.7.0 ninja==1.11.1.3
+    setuptools==80.9.0 meson==1.8.2 ninja==1.11.1.4
 
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
     cp /root/.local/bin/* /usr/bin
diff --git a/buildconfig/manylinux-build/docker_base/flac/build-flac.sh b/buildconfig/manylinux-build/docker_base/flac/build-flac.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-FLAC=flac-1.4.3
+FLAC=flac-1.5.0
 
 curl -sL --retry 10 http://downloads.xiph.org/releases/flac/${FLAC}.tar.xz > ${FLAC}.tar.xz
 sha512sum -c flac.sha512
diff --git a/buildconfig/manylinux-build/docker_base/flac/flac.sha512 b/buildconfig/manylinux-build/docker_base/flac/flac.sha512
@@ -1 +1 @@
-3cf095720bd590a588be8ccbe187d22e7a1c60ab85b1d510ce5e8a22ab0a51827b9acfeaad59bbd645a17d1f200f559255a640101b0330709a164306c0e9709e  flac-1.4.3.tar.xz
+34c9193b804e990b0828a5759e4d7ef1d1859174262d3b305d03e65285edb35c7f429e8071d9dd2c6da0c16e842b40b439bf215704636ae15dd5886151f0d17a  flac-1.5.0.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh b/buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-FSYNTH_VER="2.4.3"
+FSYNTH_VER="2.4.7"
 FSYNTH="fluidsynth-$FSYNTH_VER"
 
 curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512 b/buildconfig/manylinux-build/docker_base/fluidsynth/fluidsynth.sha512
@@ -1 +1 @@
-847d2f4529ac1bad735b71b57067c50586df7e2526c6311925c209c0635ee1e1dca1bd77dc6006181fc19a616738c8de1242bfb209707c8dbea9d7e2acc61017  fluidsynth-2.4.3.tar.gz
+8f5d9e20ab5a50b966ae9abee349913611a3e4ebb6c4a39c8b0f56aaba06483e82a761e3d38a37af689e45a0940957c9db9d324ff77352b0841da40be1ff3899  fluidsynth-2.4.7.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh b/buildconfig/manylinux-build/docker_base/freetype/build-freetype.sh
@@ -3,8 +3,11 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
+# TODO: when freetype is updated, we can look into resolving the circular
+# dependency between freetype and harfbuzz by using the upcoming freetype
+# dynamic harfbuzz loading feature.
 FREETYPE="freetype-2.13.3"
-HARFBUZZ_VER=10.2.0
+HARFBUZZ_VER=11.3.3
 HARFBUZZ_NAME="harfbuzz-$HARFBUZZ_VER"
 
 curl -sL --retry 10 https://savannah.nongnu.org/download/freetype/${FREETYPE}.tar.gz > ${FREETYPE}.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512 b/buildconfig/manylinux-build/docker_base/freetype/freetype.sha512
@@ -1,2 +1,2 @@
 b7e7e67baed421dbe08c48dcde5d5891c0f7e3c1253be8dc27826c60eaa17ca89f888c3d5a6faf5141b02c154e1cf42d4ed6133b9959ddc359fe6bd41615ae89  freetype-2.13.3.tar.gz
-522028a5de91a042832b1634fc4b7636b1b42c5ee258882d155bc33fca7b30de19ca714b4f9ea8dc3d3f537142ca2305fcf5af04bec4edbf608f557c12742e54  harfbuzz-10.2.0.tar.xz
+56a971c939522bc5edad5f8a578444844b9101321c6bacfb3d96eadf3b13238144d465dd22171b61ef7b3873af88e43297989c289a5fc37e4d390b64c435cff6  harfbuzz-11.3.3.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/libdecor/build-libdecor.sh b/buildconfig/manylinux-build/docker_base/libdecor/build-libdecor.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-LIBDECOR_VER=0.2.2
+LIBDECOR_VER=0.2.3
 LIBDECOR="libdecor-$LIBDECOR_VER"
 
 curl -sL --retry 10 https://gitlab.freedesktop.org/libdecor/libdecor/-/releases/${LIBDECOR_VER}/downloads/${LIBDECOR}.tar.xz > ${LIBDECOR}.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/libdecor/libdecor.sha512sum b/buildconfig/manylinux-build/docker_base/libdecor/libdecor.sha512sum
@@ -1 +1 @@
-ed1dfb86c28f0c84950ea5653e1ae6a83bf274e5ea51c0977ea134481536dffd31e65146c0a0aa8b67a6cad4fb8bc551b4266b04c93493547d43131dc04ea380  libdecor-0.2.2.tar.xz
+546c3224660c593412b916b659c4ea56a0461dd80304c27d001b8fdbabba4f434950c42faf344ce9a63097208386ea17728575c10ecfc29814703d8f2853621a  libdecor-0.2.3.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh b/buildconfig/manylinux-build/docker_base/libffi/build-libffi.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-LIBFFI_VER="3.4.6"
+LIBFFI_VER="3.5.1"
 LIBFFI="libffi-$LIBFFI_VER"
 
 curl -sL --retry 10 https://github.com/libffi/libffi/releases/download/v${LIBFFI_VER}/${LIBFFI}.tar.gz > ${LIBFFI}.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512 b/buildconfig/manylinux-build/docker_base/libffi/libffi.sha512
@@ -1 +1 @@
-033d2600e879b83c6bce0eb80f69c5f32aa775bf2e962c9d39fbd21226fa19d1e79173d8eaa0d0157014d54509ea73315ad86842356fc3a303c0831c94c6ab39  libffi-3.4.6.tar.gz
+3da9e21fdb920e7962ceb01ee671ef36196df4d5dad62e0cdd8e87cc60e350f241c204350560ae26ea04cc898161b5585c8a5a5125bdbcc84508efbb7ea61eb8  libffi-3.5.1.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh b/buildconfig/manylinux-build/docker_base/libjpegturbo/build-jpeg-turbo.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-JPEG_VERSION=3.1.0
+JPEG_VERSION=3.1.1
 JPEG="libjpeg-turbo-${JPEG_VERSION}"
 
 curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${JPEG_VERSION}/${JPEG}.tar.gz > ${JPEG}.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512 b/buildconfig/manylinux-build/docker_base/libjpegturbo/libjpegturbo.sha512
@@ -1 +1 @@
-63231854529f59a95814cf2414fe384360a4ed96c572764fabc535c3770c559d26943e129c905a63d5949088fa79138b1ffdb175b817f2f4d36329a3cbb23ea7  libjpeg-turbo-3.1.0.tar.gz
+d08c8eb77281c1eee2c93ef9f2eefaf79a4b9adff5172ebcb20c845ccad8896a28fc3d622002cc8b28964ff860dca0a491d6b1b921aaa7aedccd21b909aad4cb  libjpeg-turbo-3.1.1.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh b/buildconfig/manylinux-build/docker_base/libpipewire/build-libpipewire.sh
@@ -3,6 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
+# pipewire 1.4.5 has some compilation issues, stay at an older version for now
 PIPEWIRE_VER="1.2.7"
 PIPEWIRE="pipewire-$PIPEWIRE_VER"
 
diff --git a/buildconfig/manylinux-build/docker_base/libpng/build-png.sh b/buildconfig/manylinux-build/docker_base/libpng/build-png.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-PNG=libpng-1.6.46
+PNG=libpng-1.6.50
 
 curl -sL --retry 10 http://download.sourceforge.net/libpng/${PNG}.tar.gz > ${PNG}.tar.gz
 sha512sum -c png.sha512
diff --git a/buildconfig/manylinux-build/docker_base/libpng/png.sha512 b/buildconfig/manylinux-build/docker_base/libpng/png.sha512
@@ -1 +1 @@
-c7af8a3472cd4389e0d5aadca96206023ea5586ce744f852862bce600b2aca4e9641a0875f950a3ba47a2ad5d8857f40af7cd1393f28bc2c39da7bd66eb750e4  libpng-1.6.46.tar.gz
+b1efd1675843ec917c595b83a392adc9c1539ab8a65448cc33c24bd89f4b84d2d6b3f577ba3558b486c8662a463a5d68de9e7675a324b8ef7e9da175e8c3abc4  libpng-1.6.50.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh b/buildconfig/manylinux-build/docker_base/libtiff/build-tiff.sh
@@ -11,12 +11,10 @@ sha512sum -c tiff.sha512
 tar xzf ${TIFF}.tar.gz
 cd $TIFF
 
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    ./configure $PG_BASE_CONFIGURE_FLAGS --disable-lzma --disable-webp --disable-zstd
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # Use CMake on macOS because arm64 builds fail with weird errors in ./configure
-    cmake . $PG_BASE_CMAKE_FLAGS -Dlzma=OFF -Dwebp=OFF -Dzstd=OFF
-fi
+# turn off lzma, webp and zstd so that cmake does not try to pick them up from
+# the system.
+cmake . $PG_BASE_CMAKE_FLAGS -Dlzma=OFF -Dwebp=OFF -Dzstd=OFF \
+    -Dtiff-tools=OFF -Dtiff-tests=OFF -Dtiff-contrib=OFF -Dtiff-docs=OFF
 
 make
 make install
diff --git a/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh b/buildconfig/manylinux-build/docker_base/libxml2/build-libxml2.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-LIBXML2_VER=2.13
+LIBXML2_VER=2.14
 LIBXML2_PATCH=4
 LIBXML2="libxml2-$LIBXML2_VER.$LIBXML2_PATCH"
 
diff --git a/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512 b/buildconfig/manylinux-build/docker_base/libxml2/libxml2.sha512
@@ -1 +1 @@
-27bfaa63431798d3aa725b36af2005bda70a20b270e601cc3c8a07cc9fd02a080cb3d2b023eb42606a57b9786469488a7c09b71bdff1a518a0b4271c78c3f940  libxml2-2.13.4.tar.xz
+5991223bdd6c84886bba8fb81c4e48bf92c8bc3571262ffa8c7673a10efeebceafc1dee362624417dca146982d030ee8d0ccda41f4c82d3074845f74ef6da5d4  libxml2-2.14.4.tar.xz
diff --git a/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh b/buildconfig/manylinux-build/docker_base/libxmp/build-libxmp.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-XMP_VERSION=4.6.1
+XMP_VERSION=4.6.3
 XMP="libxmp-${XMP_VERSION}"
 
 
diff --git a/buildconfig/manylinux-build/docker_base/libxmp/libxmp.sha512 b/buildconfig/manylinux-build/docker_base/libxmp/libxmp.sha512
@@ -1 +1 @@
-a772a489d8c1bedda378cd36f4f359bc224a1ac16ba12486b675667c76826d1308697f03e2d6502b654e4127eaaf3930684ee4367a73b75432273662af29111d  libxmp-4.6.1.tar.gz
+fc87fafa392ebd07f6f9823801cdf296d5f5a6216e15a437d0539bc4ebf0f963bb8d868c73499d1ece33a238b71a8da6da303be23d409975a62b166225853bec  libxmp-4.6.3.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh b/buildconfig/manylinux-build/docker_base/mesa/glslang/build-glslang.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-GLSLANG_VER=14.3.0
+GLSLANG_VER=15.3.0
 GLSLANG="glslang-$GLSLANG_VER"
 curl -sL --retry 10 https://github.com/KhronosGroup/glslang/archive/refs/tags/${GLSLANG_VER}.tar.gz > ${GLSLANG}.tar.gz
 
diff --git a/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/glslang/glslang.sha512sum
@@ -1 +1 @@
-ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76  glslang-14.3.0.tar.gz
+c809caed7e6435ff75674485846f02bd8d7010e4f22911f0ee9d4cc4f703b0b6e6d828609379d4e53e97697f3f198b1ca66318a12be24c49c6800cc39593e577  glslang-15.3.0.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh b/buildconfig/manylinux-build/docker_base/mesa/mako/build-mako.sh
@@ -4,4 +4,4 @@ set -e -x
 cd $(dirname `readlink -f "$0"`)
 
 # pin for build stability, remember to keep updated
-python3 -m pip install mako==1.3.5 PyYAML==6.0.2
+python3 -m pip install mako==1.3.10 PyYAML==6.0.2
diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh b/buildconfig/manylinux-build/docker_base/mesa/mesa/build-mesa.sh
@@ -7,7 +7,7 @@ cd $(dirname `readlink -f "$0"`)
 # wayland driver needs this) and glx (SDL needs it)
 # we don't support vulkan yet
 
-MESA_VER="mesa-24.2.3"
+MESA_VER="mesa-25.1.3"
 MESA="mesa-$MESA_VER" # yes mesa comes twice in the name
 
 curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/mesa/-/archive/$MESA_VER/$MESA.tar.gz > $MESA.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum b/buildconfig/manylinux-build/docker_base/mesa/mesa/mesa.sha512sum
@@ -1 +1 @@
-be99f38318509a864212c600a8b14e9615ef7d2cfbda8d020b0059585d05dcb850601200a139b2adaf04d8d7df9c4e2661014fafab15647f3d02e3db1196c998  mesa-mesa-24.2.3.tar.gz
+f2867600fb15a6d8699d0370d4a130784dc738a54c33a69175bfc1ca3178f9cdf9e888702ec64c1ff6970adb2dd4be8c3000dfbde587229c545612ac9b4dfee2  mesa-mesa-25.1.3.tar.gz
diff --git a/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh b/buildconfig/manylinux-build/docker_base/mpg123/build-mpg123.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-MPG123="mpg123-1.32.10"
+MPG123="mpg123-1.33.0"
 
 curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2
 sha512sum -c mpg123.sha512
diff --git a/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512 b/buildconfig/manylinux-build/docker_base/mpg123/mpg123.sha512
@@ -1 +1 @@
-4df3e76cafe642b1df8befaff3d3530150c13446ca7f07b8d527af5b6522e4d2dedd025a3f095f23a51e2318d17e1395de6e55c70e3a90f80017ea0955fe8c1f  mpg123-1.32.10.tar.bz2
+c2c6a3536f18334e310337dc2cc7d4af141c1f7fffb02fc079d645f46113581d457587c562cf353d39375d721af6716cb4db6a964ef83284e390b597744c52ea  mpg123-1.33.0.tar.bz2
diff --git a/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh b/buildconfig/manylinux-build/docker_base/zlib-ng/build-zlib-ng.sh
@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-ZLIB_NG_VER=2.2.3
+ZLIB_NG_VER=2.2.4
 ZLIB_NG_NAME="zlib-ng-$ZLIB_NG_VER"
 curl -sL --retry 10 https://github.com/zlib-ng/zlib-ng/archive/refs/tags/${ZLIB_NG_VER}.tar.gz > ${ZLIB_NG_NAME}.tar.gz
 
diff --git a/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512 b/buildconfig/manylinux-build/docker_base/zlib-ng/zlib-ng.sha512
@@ -1 +1 @@
-e71e8972ec2c4dec9eaa2c8f550185f13d0f5c411c38061d1aaf78ca8e522fa3d53f005296e574af7f152e7da3a78adf97ae4bb638b7fd277ef57bba26370b7d  zlib-ng-2.2.3.tar.gz
+f49a89497988db55a2f2375f79443e7e2c57470dbd94b35ae38a39d988eb42f8ecc295a1bd68845fc273b59ea508d0e74b142585d85b7e869dd3c01cc6923d8d  zlib-ng-2.2.4.tar.gz
diff --git a/buildconfig/stubs/pygame/_render.pyi b/buildconfig/stubs/pygame/_render.pyi
@@ -40,6 +40,8 @@ class Renderer:
     def fill_rect(self, rect: RectLike) -> None: ...
     def fill_triangle(self, p1: Point, p2: Point, p3: Point) -> None: ...
     def get_viewport(self) -> Rect: ...
+    def coordinates_to_window(self, point: Point) -> tuple[float, float]: ...
+    def coordinates_from_window(self, point: Point) -> tuple[float, float]: ...
     def present(self) -> None: ...
     def set_viewport(self, area: Optional[RectLike]) -> None: ...
     def to_surface(
diff --git a/buildconfig/stubs/pygame/_sdl2/video.pyi b/buildconfig/stubs/pygame/_sdl2/video.pyi
@@ -146,6 +146,8 @@ class Renderer:
     def get_viewport(self) -> Rect: ...
     def set_viewport(self, area: Optional[RectLike]) -> None: ...
     logical_size: Iterable[int]
+    def coordinates_to_window(self, point: Point) -> tuple[float, float]: ...
+    def coordinates_from_window(self, point: Point) -> tuple[float, float]: ...
     scale: Iterable[float]
     target: Optional[Texture]
     def blit(
diff --git a/dev.py b/dev.py
@@ -196,9 +196,9 @@ def __init__(self) -> None:
             "build": get_build_deps(),
             "docs": get_build_deps(),
             "test": {"numpy"},
-            "lint": {"pylint==3.3.1", "numpy"},
+            "lint": {"pylint==3.3.7", "numpy"},
             "stubs": {"mypy==1.13.0", "numpy"},
-            "format": {"pre-commit==4.0.1"},
+            "format": {"pre-commit==4.2.0"},
         }
         self.deps["all"] = set()
         for k in self.deps.values():
diff --git a/docs/reST/ref/sdl2_video.rst b/docs/reST/ref/sdl2_video.rst
@@ -428,6 +428,25 @@
                    drawing area on the target, or ``None`` to use the
                    entire area of the current rendering target.
 
+   .. method:: coordinates_to_window
+
+      | :sl:`Translates renderer coordinates to window coordinates`
+      | :sg:`coordinates_to_window(point) -> (float, float)`
+
+      :param point: The coordinates in render space.
+
+      .. versionadded:: 2.5.6
+
+
+   .. method:: coordinates_from_window
+
+      | :sl:`Translates window coordinates to renderer coordinates`
+      | :sg:`coordinates_from_window(point) -> (float, float)`
+
+      :param point: The coordinates in window space.
+
+      .. versionadded:: 2.5.6
+
    .. method:: blit
 
       | :sl:`Draw textures using a Surface-like API`
diff --git a/pyproject.toml b/pyproject.toml
@@ -54,12 +54,12 @@ pygame_ce = 'pygame.__briefcase.pygame_ce:PygameCEGuiBootstrap'
 
 [build-system]
 requires = [
-  "meson-python<=0.17.1",
-  "meson<=1.7.0",
+  "meson-python<=0.18.0",
+  "meson<=1.8.2",
   "ninja<=1.12.1",
   "cython<=3.1.2",
-  "sphinx<=8.1.3",
-  "sphinx-autoapi<=3.3.2",
+  "sphinx<=8.2.3",
+  "sphinx-autoapi<=3.6.0",
   "pyproject-metadata!=0.9.1",
 ]
 build-backend = 'mesonpy'
diff --git a/src_c/_pygame.h b/src_c/_pygame.h
diff --git a/src_c/cython/pygame/_sdl2/video.pxd b/src_c/cython/pygame/_sdl2/video.pxd
diff --git a/src_c/cython/pygame/_sdl2/video.pyx b/src_c/cython/pygame/_sdl2/video.pyx
diff --git a/src_c/display.c b/src_c/display.c
diff --git a/src_c/doc/sdl2_video_doc.h b/src_c/doc/sdl2_video_doc.h
diff --git a/src_c/event.c b/src_c/event.c
diff --git a/src_c/font.c b/src_c/font.c
diff --git a/src_c/image.c b/src_c/image.c
diff --git a/src_c/imageext.c b/src_c/imageext.c
diff --git a/src_c/include/_pygame.h b/src_c/include/_pygame.h
diff --git a/src_c/meson.build b/src_c/meson.build
diff --git a/src_c/render.c b/src_c/render.c
diff --git a/src_c/rwobject.c b/src_c/rwobject.c
diff --git a/src_c/surface.c b/src_c/surface.c
diff --git a/src_c/window.c b/src_c/window.c
diff --git a/test/render_test.py b/test/render_test.py
diff --git a/test/video_test.py b/test/video_test.py

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0 alsa-lib-1.2.13.tar.bz2`
	`1`	`+2716cc3a2299da4a1a170d734af082d78dc452b253179d0f1a9ec190140734aecf002b6924eec4ff2699ce88ce1ae5c56821c267f36384910984db726d1f9626 alsa-lib-1.2.14.tar.bz2`