Skip to content

Commit 953dbec

Browse files
Starbuck5Starbuck5
authored
Merge pull request #3322 from pygame-community/ankith26-maint
General maintenance: Minor dev.py fixes, SDL(2+3) and deps updates
2 parents 9fae1cf + 0426566 commit 953dbec

40 files changed

+45
-126
lines changed

‎.github/workflows/build-macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ jobs:
132132
fail-on-cache-miss: true
133133

134134
- name: Install uv for speed
135-
uses: yezz123/setup-uv@v4
135+
uses: astral-sh/setup-uv@v5
136136
with:
137-
uv-version: "0.5.4"
137+
version: "0.5.26"
138138

139139
- name: Build and test wheels
140140
uses: pypa/cibuildwheel@v2.22.0

‎.github/workflows/build-windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ jobs:
5757
arch: ${{ matrix.msvc-dev-arch }}
5858

5959
- name: Install uv for speed
60-
uses: yezz123/setup-uv@v4
60+
uses: astral-sh/setup-uv@v5
6161
with:
62-
uv-version: "0.5.4"
62+
version: "0.5.26"
6363

6464
- name: Build and test wheels
6565
uses: pypa/cibuildwheel@v2.22.0

‎buildconfig/download_win_prebuilt.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ def get_urls(x86=True, x64=True):
7878
url_sha1 = []
7979
url_sha1.extend([
8080
[
81-
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.11/SDL2-devel-2.30.11-VC.zip',
82-
'163e3300a1450e6e7d4fff0d35b039c3eae44e79',
81+
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-devel-2.30.12-VC.zip',
82+
'e63d904330034ab9e6794eb1f54fe2fb7d21e9f7',
8383
],
8484
[
85-
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-VC.zip',
86-
'd382072cd045d74a802541bf8d0b13e21ffed740'
85+
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.2/SDL3-devel-3.2.2-VC.zip',
86+
'fabb3c78f7eebf6a877e8f91d17d6dd10a987b27'
8787
],
8888
[
8989
'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
@@ -254,23 +254,23 @@ def copy(src, dst):
254254
copy(
255255
os.path.join(
256256
temp_dir,
257-
'SDL2-devel-2.30.11-VC/SDL2-2.30.11'
257+
'SDL2-devel-2.30.12-VC/SDL2-2.30.12'
258258
),
259259
os.path.join(
260260
move_to_dir,
261261
prebuilt_dir,
262-
'SDL2-2.30.11'
262+
'SDL2-2.30.12'
263263
)
264264
)
265265
copy(
266266
os.path.join(
267267
temp_dir,
268-
'SDL3-devel-3.2.0-VC/SDL3-3.2.0'
268+
'SDL3-devel-3.2.2-VC/SDL3-3.2.2'
269269
),
270270
os.path.join(
271271
move_to_dir,
272272
prebuilt_dir,
273-
'SDL3-3.2.0'
273+
'SDL3-3.2.2'
274274
)
275275
)
276276

‎buildconfig/manylinux-build/docker_base/Dockerfile-aarch64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pin version on image for CI stability
22
FROM quay.io/pypa/manylinux2014_aarch64:2024.11.16-1
3-
ENV MAKEFLAGS="-j 2"
3+
ENV MAKEFLAGS="-j 4"
44
ENV PG_DEP_PREFIX="/usr/local"
55

66
# Set up repoforge

‎buildconfig/manylinux-build/docker_base/Dockerfile-i686‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pin version on image for CI stability
22
FROM quay.io/pypa/manylinux2014_i686:2024.11.16-1
3-
ENV MAKEFLAGS="-j 2"
3+
ENV MAKEFLAGS="-j 4"
44
ENV PG_DEP_PREFIX="/usr/local"
55

66
# Set up repoforge

‎buildconfig/manylinux-build/docker_base/Dockerfile-x86_64‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# pin version on image for CI stability
22
FROM quay.io/pypa/manylinux2014_x86_64:2024.11.16-1
3-
ENV MAKEFLAGS="-j 2"
3+
ENV MAKEFLAGS="-j 4"
44
ENV PG_DEP_PREFIX="/usr/local"
55

66
# Set up repoforge

‎buildconfig/manylinux-build/docker_base/alsa/alsa.sha512‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d alsa-lib-1.2.12.tar.bz2
1+
b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0 alsa-lib-1.2.13.tar.bz2

‎buildconfig/manylinux-build/docker_base/alsa/build-alsa.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
ALSA=alsa-lib-1.2.12
6+
ALSA=alsa-lib-1.2.13
77
curl -sL https://www.alsa-project.org/files/pub/lib/${ALSA}.tar.bz2 > ${ALSA}.tar.bz2
88
sha512sum -c alsa.sha512
99

‎buildconfig/manylinux-build/docker_base/buildtools/install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
# pin versions for stability (remember to keep updated)
1919
python3 -m pip install $PG_PIP_EXTRA_FLAGS \
20-
setuptools==75.1.0 cmake==3.30.3 meson==1.5.2 ninja==1.11.1.1
20+
setuptools==75.8.0 cmake==3.31.4 meson==1.7.0 ninja==1.11.1.3
2121

2222
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
2323
cp /root/.local/bin/* /usr/bin

‎buildconfig/manylinux-build/docker_base/fluidsynth/build-fluidsynth.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e -x
33

44
cd $(dirname `readlink -f "$0"`)
55

6-
FSYNTH_VER="2.3.6"
6+
FSYNTH_VER="2.4.3"
77
FSYNTH="fluidsynth-$FSYNTH_VER"
88

99
curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz

0 commit comments

Comments
 (0)