[Scummvm-git-logs] scummvm master -> 240bd1dd76796d6efc2eef9b4f0267e815b8b564
lephilousophe
noreply at scummvm.org
Mon Oct 12 18:26:41 UTC 2026
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
e2ca2bf750 CI: Fix failing windows-arm64 build
240bd1dd76 CI: Fix failing emscripten extra-libs build
Commit: e2ca2bf750cddc8df0f8ca6ab6f97de91ac6f330
https://github.com/scummvm/scummvm/commit/e2ca2bf750cddc8df0f8ca6ab6f97de91ac6f330
Author: Hajin Jang (jb6804 at naver.com)
Date: 2026-10-12T20:26:18+02:00
Commit Message:
CI: Fix failing windows-arm64 build
- 'windows-latest' runner target has been drifted to VS2026 from VS2022, but the old vcpkg commit was not supporting VS2026 properly.
- Fix it with two changes:
* Update vcpkg commit to the latest release (2026-07-24).
* Force windows runner image to run on VS2026.
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa19879897e..7323be904e8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
dists/emscripten/build.sh make
windows:
name: Windows
- runs-on: windows-latest
+ runs-on: windows-2025-vs2026
strategy:
fail-fast: false
matrix:
@@ -71,7 +71,7 @@ jobs:
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
VCPKG_OVERLAY_PORTS: ${{ github.workspace }}/.github/vcpkg-ports
- GIT_VCPKG_COMMIT: ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0
+ GIT_VCPKG_COMMIT: 9e593bb18ea69cc5095e012465dcd675a822ed0d
permissions:
contents: write # For dependencygraph
steps:
Commit: 240bd1dd76796d6efc2eef9b4f0267e815b8b564
https://github.com/scummvm/scummvm/commit/240bd1dd76796d6efc2eef9b4f0267e815b8b564
Author: Hajin Jang (jb6804 at naver.com)
Date: 2026-10-12T20:26:18+02:00
Commit Message:
CI: Fix failing emscripten extra-libs build
- FAAD2 stopped distribution via SourceForge, breaking emscripten dist script.
- Change FAAD2 source link to Github, where FAAD2 has been migrated into. Also call autoreconf, as GitHub dist does not ship with prebuilt configure script.
Changed paths:
dists/emscripten/build.sh
diff --git a/dists/emscripten/build.sh b/dists/emscripten/build.sh
index 4fa5419b583..1e9351c6e71 100755
--- a/dists/emscripten/build.sh
+++ b/dists/emscripten/build.sh
@@ -211,9 +211,10 @@ if [ "$_libfaad" = true ]; then
if [[ ! -f "$LIBS_FOLDER/build/lib/libfaad.a" ]]; then
echo "building faad2-2.8.8"
cd "$LIBS_FOLDER"
- wget -nc "https://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/faad2-2.8.8.tar.gz"
- tar -xf faad2-2.8.8.tar.gz
- cd "$LIBS_FOLDER/faad2-2.8.8/"
+ wget -nc "https://github.com/FreewareAdvancedAudio/faad2/archive/refs/tags/2_8_8.tar.gz" -O "faad2-2_8_8.tar.gz"
+ tar -xf faad2-2_8_8.tar.gz
+ cd "$LIBS_FOLDER/faad2-2_8_8/"
+ autoreconf -i
CFLAGS="-fPIC -Oz" emconfigure ./configure --host=wasm32-unknown-none --build=wasm32-unknown-none --prefix="$LIBS_FOLDER/build/"
emmake make -j 5
emmake make install
More information about the Scummvm-git-logs
mailing list