Update Emscripten WIP

Author: chkuendig

toolchains/emscripten/Dockerfile.m4

@@ -43,9 +43,7 @@ helpers_package(libmad, --with-pic --enable-fpm=no)
 
 RUN emcc -s USE_OGG=1 -E - < /dev/null
 
-# Emscripten has an official port for vorbis, but it doesn't properly link vorbisfile https://github.com/emscripten-core/emscripten/pull/14005
-# RUN emcc -s USE_VORBIS=1 -E - < /dev/null
-helpers_package(libvorbis, , CFLAGS="-fPIC -s USE_OGG=1")
+RUN emcc -s USE_VORBIS=1 -E - < /dev/null
 
 # helpers_package(libtheora, --disable-asm, CFLAGS="-fPIC -s USE_OGG=1 -s USE_VORBIS=1")
 helpers_package(libtheora, --disable-asm, CFLAGS="-fPIC -s USE_OGG=1")
@@ -58,9 +56,6 @@ helpers_package(mpeg2dec, , CFLAGS="-fPIC")
 
 helpers_package(a52dec, , CFLAGS="-fPIC")
 
-# TODO: openssl
-
-# TODO: curl
 
 # TODO: fluidlite
 

toolchains/emscripten/functions-platform.sh

@@ -1,14 +1,17 @@
 do_configure () {
+	source "$EMSDK/emsdk_env.sh" 
 	emconfigure ./configure --prefix=$PREFIX --host=$HOST --disable-shared "$@"
 }
 
 do_cmake () {
+	source "$EMSDK/emsdk_env.sh" 
 	mkdir -p build
 	cd build
 	emcmake cmake -DCMAKE_INSTALL_PREFIX=$PREFIX \
 	              -DBUILD_SHARED_LIBS=no "$@" ..
 }
 
 do_make () {
+	source "$EMSDK/emsdk_env.sh" 
 	emmake make "$@"
 }

toolchains/emscripten/packages/toolchain/build.sh

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-EMSDK_VERSION=3.1.6
+EMSDK_VERSION=4.0.10
 
 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 HELPERS_DIR=$PACKAGE_DIR/../..