Use newer emsdk with proper webview support, tune some options

Author: JustAMan

Dockerfile

@@ -1,3 +1,5 @@
+# NOTE: python3-distutils should not be needed when emsdk > 1.39.13 is used,
+#       so remove it when updating emsdk
 FROM debian:buster
 RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/force-unsafe-io
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -23,19 +25,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         autoconf \
         m4 \
         gperf \
-        wget && \
+        wget \
+        python3-distutils && \
     rm -rf /var/lib/apt/lists/*
 
 RUN pip install ply
 
 RUN git clone https://github.com/emscripten-core/emsdk.git && \
     cd emsdk && \
-    ./emsdk install 1.39.11 && \
-    ./emsdk activate 1.39.11
-
-# Patch emscripten; needed until https://github.com/emscripten-core/emscripten/pull/10846 is merged and released
-RUN wget https://raw.githubusercontent.com/emscripten-core/emscripten/d68250f1e6059168bd1f791921445527c7548e29/src/preamble.js -O /emsdk/upstream/emscripten/src/preamble.js && \
-    wget https://raw.githubusercontent.com/emscripten-core/emscripten/d68250f1e6059168bd1f791921445527c7548e29/src/URIUtils.js -O /emsdk/upstream/emscripten/src/URIUtils.js
+    ./emsdk install 1.39.13 && \
+    ./emsdk activate 1.39.13
 
 ENV PATH=$PATH:/emsdk:/emsdk/upstream/emscripten:/emsdk/node/12.9.1_64bit/bin
 WORKDIR /code

Makefile

@@ -4,7 +4,7 @@
 BASE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 DIST_DIR:=$(BASE_DIR)dist/libraries
 
-GLOBAL_CFLAGS:=-O3
+GLOBAL_CFLAGS:=-O3 -s ENVIRONMENT=web,webview -s DOUBLE_MODE=0
 
 all: subtitleoctopus
 
@@ -308,6 +308,8 @@ EMCC_COMMON_ARGS = \
 	--preload-file assets/fonts.conf \
 	-s ALLOW_MEMORY_GROWTH=1 \
 	-s FORCE_FILESYSTEM=1 \
+	-s ENVIRONMENT=web,webview \
+	-s DOUBLE_MODE=0 \
 	--llvm-lto 1 \
 	--no-heap-copy \
 	-o $@
@@ -335,6 +337,8 @@ dist/js/subtitles-octopus-worker-legacy.js: src/subtitles-octopus-worker.bc src/
 		--post-js src/post-worker.js \
 		-s WASM=0 \
 		-s LEGACY_VM_SUPPORT=1 \
+		-s MIN_CHROME_VERSION=27 \
+		-s MIN_SAFARI_VERSION=60005 \
 		$(EMCC_COMMON_ARGS)
 
 dist/js/subtitles-octopus.js: src/subtitles-octopus.js