From 9c0a375f01c076d59c45f75e3353d8f60e8fab8b Mon Sep 17 00:00:00 2001
From: Ingvar Stepanyan <rreverser@google.com>
Date: Tue, 28 Jul 2020 18:37:17 +0100
Subject: [PATCH] Fixup HQX build

Porting over few more improvements from #777 that can be applied to HQX despite the older Rust version:

 - Removed Cargo.lock from .gitignore (the file itself was added in the original PR, but is still ignored and wouldn't get committed on changes).
 - Removed couple of stray .DS_Store accidentally added in that PR.
 - Added a `--locked` to `wasm-pack` build to make sure we rebuild HQX with the same versions from Cargo.lock.
 - Removed separate `wasm-strip` and `wasm-opt -Os` steps from build.sh in HQX because they're already included in wasm-pack, and running twice only makes build slower.
---
 codecs/.DS_Store                  | Bin 6148 -> 0 bytes
 codecs/hqx/.gitignore             |   6 +-----
 codecs/hqx/Dockerfile             |   5 +----
 codecs/hqx/build.sh               |   6 +-----
 codecs/hqx/package.json           |   2 +-
 codecs/hqx/pkg/squooshhqx_bg.wasm | Bin 224021 -> 224150 bytes
 codecs/oxipng/.DS_Store           | Bin 6148 -> 0 bytes
 7 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 codecs/.DS_Store
 delete mode 100644 codecs/oxipng/.DS_Store

diff --git a/codecs/.DS_Store b/codecs/.DS_Store
deleted file mode 100644
index 0dc4c6a9ae6e5d8f1da69e95b740b6e10e993df8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%Sr=55Ukdq0WUdvoL}${mJq)n9}qz$C}AT)#N*!l?NmPu37cF!NHuiVOiy<Y
zQ-|$s05;#fJODEQQ>r6=+>FJ~T}N_N9!HBBujujowfyWi+fnp+hv(kn9pBhsg`@m_
zomFvzEl=O@!P@JreK<Q`Q(iG32E>3E5CdZ1G6U?{F4Mb2Sur36#K3_8|2{OTV^=sN
z#;1cOMgZc3?hvkHmLN8F5WB)5ksgX=Dlt>7Mhwez`dh_yg+pSd!{TPvshh1P6pP#G
zZxIgb5@p4J7&v9%I=3_L|BuuQ^Z#j*c49yb{3`}*vRE$Wd{Xt+(c`?=HtG}gR~Q@N
mG|`HQ(Tch8R(yXH*L=<Mu5d_<bowKms2>66MIr|Nf`L5;*BZnC

diff --git a/codecs/hqx/.gitignore b/codecs/hqx/.gitignore
index 53f30e50..ea8c4bf7 100644
--- a/codecs/hqx/.gitignore
+++ b/codecs/hqx/.gitignore
@@ -1,5 +1 @@
-**/*.rs.bk
-target
-Cargo.lock
-bin/
-pkg/README.md
+/target
diff --git a/codecs/hqx/Dockerfile b/codecs/hqx/Dockerfile
index c568a09f..1d1bf545 100644
--- a/codecs/hqx/Dockerfile
+++ b/codecs/hqx/Dockerfile
@@ -7,8 +7,5 @@ RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 RUN mkdir /opt/binaryen && \
  curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz  | tar -xzf - -C /opt/binaryen --strip 1
 
-RUN mkdir /opt/wabt && \
- curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
-
-ENV PATH="/opt/binaryen:/opt/wabt:${PATH}"
+ENV PATH="/opt/binaryen:${PATH}"
 WORKDIR /src
diff --git a/codecs/hqx/build.sh b/codecs/hqx/build.sh
index fe163c2b..0820d1a9 100755
--- a/codecs/hqx/build.sh
+++ b/codecs/hqx/build.sh
@@ -6,12 +6,8 @@ echo "============================================="
 echo "Compiling wasm"
 echo "============================================="
 (
-  wasm-pack build
-  wasm-strip pkg/squooshhqx_bg.wasm
-  echo "Optimising Wasm so it doesn't break Chrome (this takes like 10-15mins. get a cup of tea)"
-  echo "Once https://crbug.com/974804 is fixed, we can remove this step"
+  wasm-pack build -- --verbose --locked
   rm pkg/.gitignore
-  wasm-opt -Os --no-validation -o pkg/squooshhqx_bg.wasm pkg/squooshhqx_bg.wasm
 )
 echo "============================================="
 echo "Compiling wasm  done"
diff --git a/codecs/hqx/package.json b/codecs/hqx/package.json
index 9c50eb01..61f6193e 100644
--- a/codecs/hqx/package.json
+++ b/codecs/hqx/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hqx",
   "scripts": {
-    "build:image": "docker build -t squoosh-hqx .",
+    "build:image": "docker build -t squoosh-hqx - < Dockerfile",
     "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh"
   }
 }
diff --git a/codecs/hqx/pkg/squooshhqx_bg.wasm b/codecs/hqx/pkg/squooshhqx_bg.wasm
index 141692d2c57a49eb6c2af4d4c633076a3de9308e..2213c7e9614777874bca309cfebe069d0d86f2b9 100644
GIT binary patch
delta 146
zcmbPwjd$90-i8*&7N#xCqS^Hf^_&Go`6;EzsYS(1965=3>7|M3sf;W^rNt#IMh1qa
zJV5E>)Z*gQ6y2msX4WF0c(Saap0T-}fr3VAVydx;v3W|G0#K=?u7QQFp|K`gd14Mw
t8JmHgp@p6SPkCZ-u5MChUP^juo{)i_k)D~Uf`*y7iBXEBnK_fOCICDUDpvpi

delta 15
WcmbPsop<Ur-i8*&7N#xCqS*j7D+RRx

diff --git a/codecs/oxipng/.DS_Store b/codecs/oxipng/.DS_Store
deleted file mode 100644
index 069d0f12602c5d354761644954a1f520fddaac35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A{#i5Zz4z*o}mY!~rA@D{<hGL!yG=Xob)dQc;cIKxt~rR$^h<k>ezXD3Zko
z@B!rt<wI!yp<mK-XLdJ;C~!j+pc!fQ&CbruYTsJBUd9-24uS?_7Gul+MJ$=nJRvxa
zIwvLVLF8DY-}B?thu&YmHy2Hg*T?|wU77XR1?%{u$NLvY{k&fP!%OAL!s3!)eyEz&
z<*Iq^cGHoYd-<T>^s=_K;YLB|d)a9e<lW;iIf%nyn0(F-y*$j$F!(r4V+c^T=buF3
zsBNw8r%CQbNtnrcs>avTC<)S0GaV#BU&ia=(mwL?F4QqLosN)9nugi7*2m+<j&0Y(
zo^4NRV!XRsuZiuC_GDrj#`@N$FW&~2S3j<AZhzk0|56*k;aiomqHzkp!O&a`-7JaI
zqywI5^fZc)7$63Sfw#|qKG}@w+g}Q;fEXYKUYG$q9|S0(qp?sZj}B<?_Yub{h$vv=
zTLMvNbTk$UVFZM$R6v!=^%H}ubnpuu=V&Yxs&vNX%uq+q%=HU}%h|y%WH{rFLTZTt
zVqlhmvg%rR{~tX6{+~^v9x*@+yekHHrRBDouq1uA&Mgk_S^@eU6b0i7g%2rU$g3D)
f@hV;el>&Z&2B4#{PzW9n`Vo*cP(uv-R|ft8-u++i