Skip to content

Commit 583f26b

Browse files
committed
Update bundled SDL to 3.4.18
Keep SDL 3.2.30 for ReadTheDocs, more stable
1 parent e124bbe commit 583f26b

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

‎.github/workflows/python-package.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ defaults:
1818

1919
env:
2020
git-depth: 0 # Depth to search for tags.
21-
sdl-version: "3.2.16" # SDL version to bundle
21+
sdl-version: "3.4.18" # SDL version to bundle
2222

2323
jobs:
2424
ruff:
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-26.04-arm
5454
timeout-minutes: 5
5555
steps:
56-
- uses: libsdl-org/setup-sdl@1894460666e4fe0c6603ea0cce5733f1cca56ba1
56+
- uses: libsdl-org/setup-sdl@v1.0.1
5757
with:
5858
install-linux-dependencies: true
5959
build-type: "Debug"
@@ -143,7 +143,7 @@ jobs:
143143
run: |
144144
sudo apt-get update
145145
sudo apt-get install xvfb
146-
- uses: libsdl-org/setup-sdl@1894460666e4fe0c6603ea0cce5733f1cca56ba1
146+
- uses: libsdl-org/setup-sdl@v1.0.1
147147
if: runner.os == 'Linux'
148148
with:
149149
install-linux-dependencies: true
@@ -181,7 +181,7 @@ jobs:
181181
runs-on: ubuntu-24.04
182182
timeout-minutes: 15
183183
steps:
184-
- uses: libsdl-org/setup-sdl@1894460666e4fe0c6603ea0cce5733f1cca56ba1
184+
- uses: libsdl-org/setup-sdl@v1.0.1
185185
if: runner.os == 'Linux'
186186
with:
187187
install-linux-dependencies: true
@@ -226,7 +226,7 @@ jobs:
226226
- name: Install Python dependencies
227227
run: |
228228
python -m pip install --upgrade pip tox
229-
- uses: libsdl-org/setup-sdl@1894460666e4fe0c6603ea0cce5733f1cca56ba1
229+
- uses: libsdl-org/setup-sdl@v1.0.1
230230
if: runner.os == 'Linux'
231231
with:
232232
install-linux-dependencies: true

‎.readthedocs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ build:
1616
- ninja-build
1717
jobs:
1818
pre_install:
19-
- git clone --depth 1 --branch release-3.2.16 https://github.com/libsdl-org/SDL.git sdl_repo
19+
- git clone --depth 1 --branch release-3.2.30 https://github.com/libsdl-org/SDL.git sdl_repo
2020
- cmake -S sdl_repo -B sdl_build -D CMAKE_INSTALL_PREFIX=~/.local
2121
- cmake --build sdl_build --config Debug
2222
- cmake --install sdl_build

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](https://semver.org/) since version
66

77
## [Unreleased]
88

9+
### Changed
10+
11+
- Updated bundled SDL to 3.4.18
12+
913
### Fixed
1014

1115
- `tcod.path.SimpleGraph` caps its automatic diagonal heuristic at two cardinal steps when those are cheaper. https://github.com/libtcod/python-tcod/pull/198

‎build_sdl.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ def python_machine() -> str:
4646
# Reject versions of SDL older than this, update the requirements in the readme if you change this.
4747
SDL_MIN_VERSION = (3, 2, 0)
4848
# The SDL version to parse and export symbols from.
49-
SDL_PARSE_VERSION = os.environ.get("SDL_VERSION", "3.2.16")
49+
SDL_PARSE_VERSION = os.environ.get("SDL_VERSION", "3.4.18")
5050
# The SDL version to include in binary distributions.
51-
SDL_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "3.2.16")
51+
SDL_BUNDLE_VERSION = os.environ.get("SDL_VERSION", "3.4.18")
5252

5353

5454
# Used to remove excessive newlines in debug outputs.

0 commit comments

Comments
 (0)