Skip to content

Commit ea2c419

Browse files
intjelicintjelic
committed
Update to SFML 3.0.2
1 parent 102e5f8 commit ea2c419

105 files changed

Lines changed: 8932 additions & 2363 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/copilot-instructions.md‎

Whitespace-only changes.

‎.github/scripts/FindOpenAL.cmake‎

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎.github/scripts/build-sfml-unix.sh‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ set -euo pipefail
55
version="${1:?SFML version is required}"
66
prefix="${2:?install prefix is required}"
77
install_deps="${3:-0}"
8-
openal_prefix=""
98

109
cmake_args=(
1110
-G Ninja
@@ -33,14 +32,11 @@ if [[ "${install_deps}" == "1" ]]; then
3332
libflac-dev \
3433
libfreetype6-dev \
3534
libgl1-mesa-dev \
36-
libjpeg-dev \
37-
libopenal-dev \
3835
libudev-dev \
3936
libvorbis-dev \
4037
libx11-dev \
4138
libxcursor-dev \
4239
libxi-dev \
43-
libxinerama-dev \
4440
libxrandr-dev \
4541
ninja-build \
4642
pkg-config
@@ -52,15 +48,11 @@ if [[ "${install_deps}" == "1" ]]; then
5248
git \
5349
libX11-devel \
5450
libXcursor-devel \
55-
libXext-devel \
5651
libXi-devel \
57-
libXinerama-devel \
5852
libXrandr-devel \
59-
libjpeg-turbo-devel \
6053
libudev-devel \
6154
mesa-libGL-devel \
6255
ninja-build \
63-
openal-soft-devel \
6456
pkgconf-pkg-config \
6557
flac-devel \
6658
libvorbis-devel
@@ -72,33 +64,17 @@ if [[ "${install_deps}" == "1" ]]; then
7264
git \
7365
libX11-devel \
7466
libXcursor-devel \
75-
libXext-devel \
7667
libXi-devel \
77-
libXinerama-devel \
7868
libXrandr-devel \
79-
libjpeg-turbo-devel \
8069
libudev-devel \
8170
mesa-libGL-devel \
8271
ninja-build \
83-
openal-soft-devel \
8472
pkgconfig \
8573
flac-devel \
8674
libvorbis-devel
8775
elif command -v brew >/dev/null 2>&1; then
8876
brew update
89-
brew install cmake ninja pkg-config freetype libogg libvorbis flac jpeg-turbo openal-soft
90-
91-
brew_prefix="$(brew --prefix)"
92-
openal_prefix="$(brew --prefix openal-soft)"
93-
macos_rpath="${prefix}/lib;${brew_prefix}/lib;/System/Library/Frameworks;/Library/Frameworks"
94-
cmake_args+=(
95-
-DCMAKE_FIND_FRAMEWORK=LAST
96-
"-DCMAKE_PREFIX_PATH=${brew_prefix}"
97-
"-DOPENAL_LIBRARY=${openal_prefix}/lib/libopenal.dylib"
98-
"-DOPENAL_INCLUDE_DIR=${openal_prefix}/include/AL"
99-
"-DCMAKE_INSTALL_RPATH=${macos_rpath}"
100-
-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
101-
)
77+
brew install cmake ninja pkg-config
10278
fi
10379
fi
10480

@@ -108,10 +84,6 @@ trap 'rm -rf "${src_dir}" "${build_dir}"' EXIT
10884

10985
git clone --branch "${version}" --depth 1 https://github.com/SFML/SFML "${src_dir}"
11086

111-
if [[ -n "${openal_prefix:-}" ]]; then
112-
cp "$(dirname "$0")/FindOpenAL.cmake" "${src_dir}/cmake/Modules/FindOpenAL.cmake"
113-
fi
114-
11587
cmake -S "${src_dir}" -B "${build_dir}" "${cmake_args[@]}"
11688
cmake --build "${build_dir}"
11789
cmake --install "${build_dir}"

‎.github/scripts/run-wheel-tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def sanitized_env() -> dict[str, str]:
2121
env.pop(name, None)
2222

2323
if os.name == "nt":
24-
blocked = ("c:/cibw-sfml-2.6.2/bin", "c:\\cibw-sfml-2.6.2\\bin")
24+
blocked = ("c:/cibw-sfml-3.0.2/bin", "c:\\cibw-sfml-3.0.2\\bin")
2525
path_parts = env.get("PATH", "").split(os.pathsep)
2626
env["PATH"] = os.pathsep.join(
2727
part

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323

2424
env:
2525
ALSOFT_DRIVERS: "null"
26-
SFML_VERSION: 2.6.2
27-
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-2.6.2-install
26+
SFML_VERSION: 3.0.2
27+
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-3.0.2-install
2828

2929
steps:
3030
- name: Check out repository
@@ -45,20 +45,17 @@ jobs:
4545
libflac-dev \
4646
libfreetype6-dev \
4747
libgl1-mesa-dev \
48-
libjpeg-dev \
49-
libopenal-dev \
5048
libudev-dev \
5149
libvorbis-dev \
5250
libx11-dev \
5351
libxcursor-dev \
5452
libxi-dev \
55-
libxinerama-dev \
5653
libxrandr-dev \
5754
ninja-build \
5855
pkg-config \
5956
xvfb
6057
61-
- name: Build SFML 2.6.2
58+
- name: Build SFML 3.0.2
6259
run: bash .github/scripts/build-sfml-unix.sh "$SFML_VERSION" "$SFML_INSTALL_PREFIX"
6360

6461
- name: Install Python tooling
@@ -89,8 +86,8 @@ jobs:
8986

9087
env:
9188
ALSOFT_DRIVERS: "null"
92-
SFML_VERSION: 2.6.2
93-
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-2.6.2-install
89+
SFML_VERSION: 3.0.2
90+
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-3.0.2-install
9491

9592
steps:
9693
- name: Check out repository
@@ -111,19 +108,16 @@ jobs:
111108
libflac-dev \
112109
libfreetype6-dev \
113110
libgl1-mesa-dev \
114-
libjpeg-dev \
115-
libopenal-dev \
116111
libudev-dev \
117112
libvorbis-dev \
118113
libx11-dev \
119114
libxcursor-dev \
120115
libxi-dev \
121-
libxinerama-dev \
122116
libxrandr-dev \
123117
ninja-build \
124118
pkg-config
125119
126-
- name: Build SFML 2.6.2
120+
- name: Build SFML 3.0.2
127121
run: bash .github/scripts/build-sfml-unix.sh "$SFML_VERSION" "$SFML_INSTALL_PREFIX"
128122

129123
- name: Install packaging tools
@@ -173,8 +167,8 @@ jobs:
173167

174168
env:
175169
ALSOFT_DRIVERS: "null"
176-
SFML_VERSION: 2.6.2
177-
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-2.6.2-install
170+
SFML_VERSION: 3.0.2
171+
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-3.0.2-install
178172

179173
steps:
180174
- name: Check out repository
@@ -185,7 +179,7 @@ jobs:
185179
with:
186180
python-version: "3.12"
187181

188-
- name: Build SFML 2.6.2
182+
- name: Build SFML 3.0.2
189183
run: bash .github/scripts/build-sfml-unix.sh "$SFML_VERSION" "$SFML_INSTALL_PREFIX" 1
190184

191185
- name: Install package and pytest
@@ -208,7 +202,7 @@ jobs:
208202
runs-on: windows-2022
209203

210204
env:
211-
SFML_VERSION: 2.6.2
205+
SFML_VERSION: 3.0.2
212206

213207
steps:
214208
- name: Check out repository
@@ -219,10 +213,10 @@ jobs:
219213
with:
220214
python-version: "3.12"
221215

222-
- name: Build SFML 2.6.2
216+
- name: Build SFML 3.0.2
223217
shell: pwsh
224218
run: |
225-
$prefix = Join-Path $env:GITHUB_WORKSPACE '.deps\sfml-2.6.2-install'
219+
$prefix = Join-Path $env:GITHUB_WORKSPACE '.deps\sfml-3.0.2-install'
226220
"SFML_INSTALL_PREFIX=$prefix" >> $env:GITHUB_ENV
227221
"SFML_HEADERS=$(Join-Path $prefix 'include')" >> $env:GITHUB_ENV
228222
"SFML_LIBRARIES=$(Join-Path $prefix 'lib')" >> $env:GITHUB_ENV
@@ -254,8 +248,8 @@ jobs:
254248
runs-on: ubuntu-24.04
255249

256250
env:
257-
SFML_VERSION: 2.6.2
258-
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-2.6.2-install
251+
SFML_VERSION: 3.0.2
252+
SFML_INSTALL_PREFIX: ${{ github.workspace }}/.deps/sfml-3.0.2-install
259253

260254
steps:
261255
- name: Check out repository
@@ -276,19 +270,16 @@ jobs:
276270
libflac-dev \
277271
libfreetype6-dev \
278272
libgl1-mesa-dev \
279-
libjpeg-dev \
280-
libopenal-dev \
281273
libudev-dev \
282274
libvorbis-dev \
283275
libx11-dev \
284276
libxcursor-dev \
285277
libxi-dev \
286-
libxinerama-dev \
287278
libxrandr-dev \
288279
ninja-build \
289280
pkg-config
290281
291-
- name: Build SFML 2.6.2
282+
- name: Build SFML 3.0.2
292283
run: bash .github/scripts/build-sfml-unix.sh "$SFML_VERSION" "$SFML_INSTALL_PREFIX"
293284

294285
- name: Install package and mypy

0 commit comments

Comments
 (0)