[Scummvm-git-logs] scummvm master -> a52b6356d31da0178d6b84c1087e06065b01f7b7
bluegr
noreply at scummvm.org
Sat Jul 26 09:00:32 UTC 2025
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
ade1c2fa60 DISTS: EMSCRIPTEN: Update Emscripten SDK and cleanup build.sh
bf9077feec DISTS: EMSCRIPTEN: Disable unused audio components
bf3ee0774e DISTS: EMSCRIPTEN: Change the upstream URL for libmpeg2 to VideoLAN
cbd1fb7f81 BACKENDS: EMSCRIPTEN: Fix missing TTS include
bf932da8dd CI: Add Emscripten builds
a52b6356d3 DISTS: EMSCRIPTEN: Change the upstream URL for a52dec to VideoLAN
Commit: ade1c2fa60a362b35ca5d8439aa23f704590af26
https://github.com/scummvm/scummvm/commit/ade1c2fa60a362b35ca5d8439aa23f704590af26
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
DISTS: EMSCRIPTEN: Update Emscripten SDK and cleanup build.sh
Changed paths:
dists/emscripten/build.sh
diff --git a/dists/emscripten/build.sh b/dists/emscripten/build.sh
index 4780f5cce94..2ff331b5924 100755
--- a/dists/emscripten/build.sh
+++ b/dists/emscripten/build.sh
@@ -32,7 +32,7 @@ TASKS=()
CONFIGURE_ARGS=()
_bundle_games=()
_verbose=false
-EMSDK_VERSION="3.1.51"
+EMSDK_VERSION="${EMSDK_VERSION:-4.0.10}"
EMSCRIPTEN_VERSION="$EMSDK_VERSION"
usage="\
@@ -117,7 +117,7 @@ fi
# Setup Toolchain
#################################
-# Activate Emscripten
+# Download Emscripten
if [[ ! -d "$DIST_FOLDER/emsdk-$EMSDK_VERSION" ]]; then
echo "$DIST_FOLDER/emsdk-$EMSDK_VERSION not found. Installing Emscripten"
cd "$DIST_FOLDER"
@@ -127,7 +127,6 @@ if [[ ! -d "$DIST_FOLDER/emsdk-$EMSDK_VERSION" ]]; then
wget -nc --content-disposition --no-check-certificate "https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK_VERSION}.tar.gz"
tar -xf "emsdk-${EMSDK_VERSION}.tar.gz"
fi
-
fi
cd "$DIST_FOLDER/emsdk-${EMSDK_VERSION}"
@@ -178,7 +177,6 @@ fi
#################################
# Download + Install Libraries (if not part of Emscripten-Ports, these are handled by configure)
#################################
-
if [[ ! -d "$LIBS_FOLDER/build" ]]; then
mkdir -p "$LIBS_FOLDER/build"
fi
@@ -234,7 +232,7 @@ if [ "$_libmpeg2" = true ]; then
wget -nc "http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz"
tar -xf libmpeg2-0.5.1.tar.gz
cd "$LIBS_FOLDER/libmpeg2-0.5.1/"
- CFLAGS="-fPIC -Oz" emconfigure ./configure --host=wasm32-unknown-none --prefix="$LIBS_FOLDER/build/" --disable-sdl
+ CFLAGS="-fPIC -Oz" emconfigure ./configure --build=wasm32-unknown-none --prefix="$LIBS_FOLDER/build/" --disable-sdl
emmake make -j 5
emmake make install
fi
@@ -366,9 +364,5 @@ fi
if [[ "run" =~ $(echo ^\(${TASKS}\)$) ]]; then
echo "Run ScummVM"
cd "${ROOT_FOLDER}/build-emscripten/"
- # emrun doesn't support range requests. Once it will, we don't need node-static anymore
emrun --browser=chrome scummvm.html
-
- # TODO: https://github.com/cloudhead/node-static/issues/241 means node-static doesn't work either.
- # $EMSDK_NPX -p node-static static .
fi
Commit: bf9077feecb51543153f30308fcf3c8836cbe6b7
https://github.com/scummvm/scummvm/commit/bf9077feecb51543153f30308fcf3c8836cbe6b7
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
DISTS: EMSCRIPTEN: Disable unused audio components
Changed paths:
configure
diff --git a/configure b/configure
index fc534675a15..4a4476e689d 100755
--- a/configure
+++ b/configure
@@ -3630,6 +3630,9 @@ if test -n "$_host"; then
_libcurl=no
_curl=no
_enet=no
+ _seq_midi=no
+ _timidity=no
+ _sndio=no
_ar="emar cr"
_ranlib="emranlib"
;;
Commit: bf3ee0774eba48cb70b816def7a98f4743bd0600
https://github.com/scummvm/scummvm/commit/bf3ee0774eba48cb70b816def7a98f4743bd0600
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
DISTS: EMSCRIPTEN: Change the upstream URL for libmpeg2 to VideoLAN
The original libmpeg2 source archive is gone from SF.NET, so use the
patched libmpeg2 sources from the VideoLAN git repo instead
Changed paths:
dists/emscripten/build.sh
diff --git a/dists/emscripten/build.sh b/dists/emscripten/build.sh
index 2ff331b5924..33c96ac4bf3 100755
--- a/dists/emscripten/build.sh
+++ b/dists/emscripten/build.sh
@@ -227,11 +227,12 @@ fi
if [ "$_libmpeg2" = true ]; then
if [[ ! -f "$LIBS_FOLDER/build/lib/libmpeg2.a" ]]; then
- echo "building libmpeg2-0.5.1"
+ echo "building libmpeg2-946bf4b5"
cd "$LIBS_FOLDER"
- wget -nc "http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz"
- tar -xf libmpeg2-0.5.1.tar.gz
- cd "$LIBS_FOLDER/libmpeg2-0.5.1/"
+ wget -nc --content-disposition "https://code.videolan.org/videolan/libmpeg2/-/archive/946bf4b518aacc224f845e73708f99e394744499/libmpeg2-946bf4b518aacc224f845e73708f99e394744499.tar.gz"
+ tar -xf libmpeg2-946bf4b518aacc224f845e73708f99e394744499.tar.gz
+ cd "$LIBS_FOLDER/libmpeg2-946bf4b518aacc224f845e73708f99e394744499/"
+ autoreconf -i
CFLAGS="-fPIC -Oz" emconfigure ./configure --build=wasm32-unknown-none --prefix="$LIBS_FOLDER/build/" --disable-sdl
emmake make -j 5
emmake make install
Commit: cbd1fb7f814c70ab83c6fa9c4f66a1e9d5a00b0d
https://github.com/scummvm/scummvm/commit/cbd1fb7f814c70ab83c6fa9c4f66a1e9d5a00b0d
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
BACKENDS: EMSCRIPTEN: Fix missing TTS include
Changed paths:
backends/platform/sdl/emscripten/emscripten.cpp
diff --git a/backends/platform/sdl/emscripten/emscripten.cpp b/backends/platform/sdl/emscripten/emscripten.cpp
index 8f545246f53..94ca5535970 100644
--- a/backends/platform/sdl/emscripten/emscripten.cpp
+++ b/backends/platform/sdl/emscripten/emscripten.cpp
@@ -28,6 +28,9 @@
#include "backends/platform/sdl/emscripten/emscripten.h"
#include "common/file.h"
+#ifdef USE_TTS
+#include "backends/text-to-speech/emscripten/emscripten-text-to-speech.h"
+#endif
// Inline JavaScript, see https://emscripten.org/docs/api_reference/emscripten.h.html#inline-assembly-javascript for details
EM_JS(bool, isFullscreen, (), {
Commit: bf932da8ddcbe903cdcb911cf41bb8dda5950870
https://github.com/scummvm/scummvm/commit/bf932da8ddcbe903cdcb911cf41bb8dda5950870
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
CI: Add Emscripten builds
Changed paths:
.github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f76ff84d049..74d7386666c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,31 @@ on: [push, pull_request]
permissions:
contents: read
jobs:
+ emscripten:
+ name: Emscripten
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - platform: emscripten
+ configFlags: --enable-gif --enable-jpeg --enable-ogg --enable-png --enable-vorbis --enable-zlib --enable-freetype2
+ - platform: emscripten
+ configFlags: --enable-gif --enable-jpeg --enable-ogg --enable-png --enable-vorbis --enable-zlib --enable-freetype2 --enable-a52 --enable-faad --enable-mad --enable-mpeg2 --enable-mpeg2 --enable-theoradec
+ steps:
+ - uses: actions/checkout at v4
+ - name: Call configure
+ run: |
+ dists/emscripten/build.sh configure --enable-all-engines --disable-engines=hpl1 ${{ matrix.configFlags }}
+ - name: Build cache
+ uses: hendrikmuhs/ccache-action at v1.2
+ with:
+ key: ${{ matrix.platform }}
+ max-size: 1G
+ create-symlink: true
+ - name: Build scummvm
+ run: |
+ dists/emscripten/build.sh make
windows:
name: Windows
runs-on: windows-latest
Commit: a52b6356d31da0178d6b84c1087e06065b01f7b7
https://github.com/scummvm/scummvm/commit/a52b6356d31da0178d6b84c1087e06065b01f7b7
Author: Christian Kündig (christian at kuendig.info)
Date: 2025-07-26T12:00:26+03:00
Commit Message:
DISTS: EMSCRIPTEN: Change the upstream URL for a52dec to VideoLAN
The original a52dec source archive is gone from SF.NET, so use the
a52dec sources from the VideoLAN git repo instead
Changed paths:
dists/emscripten/build.sh
diff --git a/dists/emscripten/build.sh b/dists/emscripten/build.sh
index 33c96ac4bf3..ece82fe5bd2 100755
--- a/dists/emscripten/build.sh
+++ b/dists/emscripten/build.sh
@@ -185,9 +185,10 @@ if [ "$_liba52" = true ]; then
if [[ ! -f "$LIBS_FOLDER/build/lib/liba52.a" ]]; then
echo "building a52dec-0.7.4"
cd "$LIBS_FOLDER"
- wget -nc "https://liba52.sourceforge.io/files/a52dec-0.7.4.tar.gz"
- tar -xf a52dec-0.7.4.tar.gz
- cd "$LIBS_FOLDER/a52dec-0.7.4/"
+ wget -nc "https://code.videolan.org/videolan/liba52/-/archive/0.7.4/liba52-0.7.4.tar.gz"
+ tar -xf liba52-0.7.4.tar.gz
+ cd "$LIBS_FOLDER/liba52-0.7.4/"
+ 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