Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General maintenance: Minor dev.py fixes, SDL(2+3) and deps updates #3322

Merged
merged 3 commits into from
Feb 2, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ jobs:
fail-on-cache-miss: true

- name: Install uv for speed
uses: yezz123/setup-uv@v4
uses: astral-sh/setup-uv@v5
with:
uv-version: "0.5.4"
version: "0.5.26"

- name: Build and test wheels
uses: pypa/cibuildwheel@v2.22.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ jobs:
arch: ${{ matrix.msvc-dev-arch }}

- name: Install uv for speed
uses: yezz123/setup-uv@v4
uses: astral-sh/setup-uv@v5
with:
uv-version: "0.5.4"
version: "0.5.26"

- name: Build and test wheels
uses: pypa/cibuildwheel@v2.22.0
Expand Down
16 changes: 8 additions & 8 deletions buildconfig/download_win_prebuilt.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ def get_urls(x86=True, x64=True):
url_sha1 = []
url_sha1.extend([
[
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.11/SDL2-devel-2.30.11-VC.zip',
'163e3300a1450e6e7d4fff0d35b039c3eae44e79',
'https://github.com/libsdl-org/SDL/releases/download/release-2.30.12/SDL2-devel-2.30.12-VC.zip',
'e63d904330034ab9e6794eb1f54fe2fb7d21e9f7',
],
[
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-VC.zip',
'd382072cd045d74a802541bf8d0b13e21ffed740'
'https://github.com/libsdl-org/SDL/releases/download/release-3.2.2/SDL3-devel-3.2.2-VC.zip',
'fabb3c78f7eebf6a877e8f91d17d6dd10a987b27'
],
[
'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
Expand Down Expand Up @@ -254,23 +254,23 @@ def copy(src, dst):
copy(
os.path.join(
temp_dir,
'SDL2-devel-2.30.11-VC/SDL2-2.30.11'
'SDL2-devel-2.30.12-VC/SDL2-2.30.12'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL2-2.30.11'
'SDL2-2.30.12'
)
)
copy(
os.path.join(
temp_dir,
'SDL3-devel-3.2.0-VC/SDL3-3.2.0'
'SDL3-devel-3.2.2-VC/SDL3-3.2.2'
),
os.path.join(
move_to_dir,
prebuilt_dir,
'SDL3-3.2.0'
'SDL3-3.2.2'
)
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pin version on image for CI stability
FROM quay.io/pypa/manylinux2014_aarch64:2024.11.16-1
ENV MAKEFLAGS="-j 2"
ENV MAKEFLAGS="-j 4"
ENV PG_DEP_PREFIX="/usr/local"

# Set up repoforge
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/Dockerfile-i686
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pin version on image for CI stability
FROM quay.io/pypa/manylinux2014_i686:2024.11.16-1
ENV MAKEFLAGS="-j 2"
ENV MAKEFLAGS="-j 4"
ENV PG_DEP_PREFIX="/usr/local"

# Set up repoforge
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pin version on image for CI stability
FROM quay.io/pypa/manylinux2014_x86_64:2024.11.16-1
ENV MAKEFLAGS="-j 2"
ENV MAKEFLAGS="-j 4"
ENV PG_DEP_PREFIX="/usr/local"

# Set up repoforge
Expand Down
2 changes: 1 addition & 1 deletion buildconfig/manylinux-build/docker_base/alsa/alsa.sha512
Original file line number Diff line number Diff line change
@@ -1 +1 @@
053e36e51c0ff28f07028b89c8845b50682a5c14035ab85c2fc8cae2f2f0d05e4cd45ed879602c15c1596fb7fe84bfd50ec0d119dfb55c66589a2d458a9b317d alsa-lib-1.2.12.tar.bz2
b0c0666e38e881dca985b61386523c045c71072a88be4952c986ffbe2107ec736da528858ebeffdf439de5c290914bf3facc654100a228c6d26fff9429142ef0 alsa-lib-1.2.13.tar.bz2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi

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

if [[ "$OSTYPE" == "linux-gnu"* ]]; then
cp /root/.local/bin/* /usr/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

FSYNTH_VER="2.3.6"
FSYNTH_VER="2.4.3"
FSYNTH="fluidsynth-$FSYNTH_VER"

curl -sL --retry 10 https://github.com/FluidSynth/fluidsynth/archive/v${FSYNTH_VER}.tar.gz > ${FSYNTH}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
521e103e49c281ab7a44a2a275f614894062c1be6eb4df776b11e3756803c6b4b73d1e9596d364959c81b37dff4798d56798f9262c486e098f072ae1e7bef1c1 fluidsynth-2.3.6.tar.gz
847d2f4529ac1bad735b71b57067c50586df7e2526c6311925c209c0635ee1e1dca1bd77dc6006181fc19a616738c8de1242bfb209707c8dbea9d7e2acc61017 fluidsynth-2.4.3.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e -x
cd $(dirname `readlink -f "$0"`)

FREETYPE="freetype-2.13.3"
HARFBUZZ_VER=10.0.1
HARFBUZZ_VER=10.2.0
HARFBUZZ_NAME="harfbuzz-$HARFBUZZ_VER"

curl -sL --retry 10 https://savannah.nongnu.org/download/freetype/${FREETYPE}.tar.gz > ${FREETYPE}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
b7e7e67baed421dbe08c48dcde5d5891c0f7e3c1253be8dc27826c60eaa17ca89f888c3d5a6faf5141b02c154e1cf42d4ed6133b9959ddc359fe6bd41615ae89 freetype-2.13.3.tar.gz
3fb7dda6e51496337698d46cebe623f678a4e5b0f006be6e1309143a82408a362c149812477e083e14811a5cba565d76eb2c0804f5e1bbea7e1bf83678176048 harfbuzz-10.0.1.tar.xz
522028a5de91a042832b1634fc4b7636b1b42c5ee258882d155bc33fca7b30de19ca714b4f9ea8dc3d3f537142ca2305fcf5af04bec4edbf608f557c12742e54 harfbuzz-10.2.0.tar.xz

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ set -e -x

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

JPEG_VERSION=3.0.4
JPEG_VERSION=3.1.0
JPEG="libjpeg-turbo-${JPEG_VERSION}"

curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/${JPEG_VERSION}.tar.gz > ${JPEG}.tar.gz
curl -sL --retry 10 https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/${JPEG_VERSION}/${JPEG}.tar.gz > ${JPEG}.tar.gz

sha512sum -c libjpegturbo.sha512
tar xzf ${JPEG}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f43e1b6b9d048e29e381796c71e1c34a04c0f1c52c1f462db9f9930cfc75d69a50861be2570a6a4adc26a4183b6601300fd9d5553c06bc042f0d32fc1e408ed9 libjpeg-turbo-3.0.4.tar.gz
63231854529f59a95814cf2414fe384360a4ed96c572764fabc535c3770c559d26943e129c905a63d5949088fa79138b1ffdb175b817f2f4d36329a3cbb23ea7 libjpeg-turbo-3.1.0.tar.gz

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

PIPEWIRE_VER="1.2.4"
PIPEWIRE_VER="1.2.7"
PIPEWIRE="pipewire-$PIPEWIRE_VER"

curl -sL --retry 10 https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${PIPEWIRE_VER}/${PIPEWIRE}.tar.gz > ${PIPEWIRE}.tar.gz
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8a5b14cb99846635d080adc9e257c59dd4ab8e84e0751d71d3371505de89d19b1769cb12020d8a45808676d625226cd07aa30544050097e5f9540c6e37e4f97e pipewire-1.2.4.tar.gz
a921bcc56626a90b4195f98cb47934d1e4eeda9d2fb76ea93ef49b56bf2b080ec711d93dfd47833bcdbc9c4623bad16c93f00828d214439aee06ab9a31f21ffd pipewire-1.2.7.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

PNG=libpng-1.6.44
PNG=libpng-1.6.46

curl -sL --retry 10 http://download.sourceforge.net/libpng/${PNG}.tar.gz > ${PNG}.tar.gz
sha512sum -c png.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
84a58ebb15df69b306b1822a9741cbff0d0e15d60a0978d831a8f9dee03b21df7cbc695102d6c135134f3daa8a0a7f050a890cd545bea102c078ba4520666e78 libpng-1.6.44.tar.gz
c7af8a3472cd4389e0d5aadca96206023ea5586ce744f852862bce600b2aca4e9641a0875f950a3ba47a2ad5d8857f40af7cd1393f28bc2c39da7bd66eb750e4 libpng-1.6.46.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

WEBP=libwebp-1.4.0
WEBP=libwebp-1.5.0

curl -sL --retry 10 http://storage.googleapis.com/downloads.webmproject.org/releases/webp/${WEBP}.tar.gz > ${WEBP}.tar.gz
sha512sum -c webp.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1217363fbb5c860b17c2ba4612f240f121c74ced6e3e58e8aa61252a9022f59893c5874bfa433cc50a7e65bac1ae2bfa99fa2cede070183b7a467f148cebb0bd libwebp-1.4.0.tar.gz
7a39594cf5585428f82d555b05e78aa63758a56841a313c0b74dfb4996afe37dddf92498d6123ff2a949a7209fb9097927f10ee75b5a38b481f110c892e5302b libwebp-1.5.0.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

XMP_VERSION=4.6.0
XMP_VERSION=4.6.1
XMP="libxmp-${XMP_VERSION}"


Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d287544c9b569515f1a3fa92d8d930097b252e84f86cba5dd70e9b4460d0fa70754ece45dcc7ec314e434d821b43207d700afb12c9df80b467d73e9d029baafe libxmp-4.6.0.tar.gz
a772a489d8c1bedda378cd36f4f359bc224a1ac16ba12486b675667c76826d1308697f03e2d6502b654e4127eaaf3930684ee4367a73b75432273662af29111d libxmp-4.6.1.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

MPG123="mpg123-1.32.7"
MPG123="mpg123-1.32.10"

curl -sL --retry 10 https://downloads.sourceforge.net/sourceforge/mpg123/${MPG123}.tar.bz2 > ${MPG123}.tar.bz2
sha512sum -c mpg123.sha512
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
71f7cf6035c489934400528d0eaf0c1104417867990dd0abcc99c682818ef1f3e99dbee9dcdd888d88ed172a8950d5df515b755a5c1c1b54fc56a28584ceef8c mpg123-1.32.7.tar.bz2
4df3e76cafe642b1df8befaff3d3530150c13446ca7f07b8d527af5b6522e4d2dedd025a3f095f23a51e2318d17e1395de6e55c70e3a90f80017ea0955fe8c1f mpg123-1.32.10.tar.bz2
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

SDL2_VER="2.30.11"
SDL2_VER="2.30.12"
SDL2="SDL2-$SDL2_VER"
IMG2_VER="2.8.4"
IMG2="SDL2_image-$IMG2_VER"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cd4c040ebe4ec74250e32b401a292658353721dda30ad1066522b2a9de9a07560313978880a0bad7e7f5103cc14278fcbe27dbc5a188189e7fb6f097e7308550 SDL2-2.30.11.tar.gz
358dc9aabebdd1242245183a76d1ddff7b312f3db1f9fd247a7bd444bc8ca4c49e36a5a02bc577f2ee0b1f38f06f85b35a3db3616fdc9a6c67cd066db5152ac7 SDL2-2.30.12.tar.gz
a4b7436442be43b96dc7b90c9badd011da1622e283ae068b82367fcb72b7dd7a0357aec5550fe44103a77da75b8c570d5204fff11a805373f2194f92b8f71343 SDL2_image-2.8.4.tar.gz
5ddbc4b0b5fad2e0844a503daa79564b912654192599ef8fa7698531f08323ce01801f6bb17b2b3905020a3df362a967b7566ae725eb085da991578cc0807aad SDL2_mixer-2.8.0.tar.gz
a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885 SDL2_ttf-2.24.0.tar.gz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

WAVPACK_VERSION=5.7.0
WAVPACK_VERSION=5.8.1
WAVPACK="wavpack-${WAVPACK_VERSION}"

curl -sL --retry 10 https://github.com/dbry/WavPack/releases/download/${WAVPACK_VERSION}/${WAVPACK}.tar.xz > ${WAVPACK}.tar.xz
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
63ef6eb5ff71bf6417175691e8377624ade02619c761d80e265c8e0e7305bfe22eeaa1402e36d20c13d20847279f95150ac014019688389da1b87b86558446bd wavpack-5.7.0.tar.xz
9ea32b3c5f876317aab7745159dfe05488cc891b55a9efc8b553fefda508cf6a58d9e20db9f43669f65222842913fab2bef2d716ee31d07f33f4693b848a6325 wavpack-5.8.1.tar.xz
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e -x

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

ZLIB_NG_VER=2.2.2
ZLIB_NG_VER=2.2.3
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

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3cb3e97ee1d20e1f3cdf0efcdf55aee0e3a192f9a2ae781cd209b1d37620c48f2ada345fb1f4357315b1cb5e09b7ea5fcdfa2fd54f7b4ac5dcb6e73860000aad zlib-ng-2.2.2.tar.gz
e71e8972ec2c4dec9eaa2c8f550185f13d0f5c411c38061d1aaf78ca8e522fa3d53f005296e574af7f152e7da3a78adf97ae4bb638b7fd277ef57bba26370b7d zlib-ng-2.2.3.tar.gz
16 changes: 0 additions & 16 deletions buildconfig/manylinux-build/docker_base/zlib/build-zlib.sh

This file was deleted.

1 change: 0 additions & 1 deletion buildconfig/manylinux-build/docker_base/zlib/zlib.sha512

This file was deleted.

4 changes: 2 additions & 2 deletions dev.py
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ def prep_env(self):
pprint("pip version is too old or unknown, attempting pip upgrade")
pip_install(self.py, ["-U", "pip"])

deps = self.deps.get(self.args["command"])
deps = self.deps.get(self.args["command"], set())
ignored_deps = self.args["ignore_dep"]
deps_filtered = deps.copy()
if ignored_deps:
Expand All @@ -456,7 +456,7 @@ def prep_env(self):
deps_filtered.remove(constr)
break

if deps:
if deps_filtered:
pprint("Installing dependencies")
pip_install(self.py, list(deps_filtered))

Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if plat == 'win' and host_machine.cpu_family().startswith('x86')
)
endif

sdl_ver = (sdl_api == 3) ? '3.2.0' : '2.30.11'
sdl_ver = (sdl_api == 3) ? '3.2.2' : '2.30.12'
sdl_image_ver = (sdl_api == 3) ? '3.1.1' : '2.8.4'
sdl_mixer_ver = '2.8.0'
sdl_ttf_ver = '2.24.0'
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pygame_ce = 'pygame.__briefcase.pygame_ce:PygameCEGuiBootstrap'
[build-system]
requires = [
"meson-python<=0.17.1",
"meson<=1.6.0",
"meson<=1.7.0",
"ninja<=1.12.1",
"cython<=3.0.11",
"sphinx<=8.1.3",
Expand Down
Loading