Update libwebp to 1.0.2 (GoogleChromeLabs#439)

* Update package.json * Update package.json * Update README.md * Update README.md * Use cmake for libwebp * Minimize libwebp
alisaitbilgi · Feb 5, 2019 · 4026714 · 4026714
1 parent 356a8bd
commit 4026714
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 40 deletions.
diff --git a/codecs/webp_dec/README.md b/codecs/webp_dec/README.md
@@ -1,7 +1,7 @@
 # WebP decoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v0.6.1
+- Version: v1.0.2
 
 ## Example
 

diff --git a/codecs/webp_dec/build.sh b/codecs/webp_dec/build.sh
@@ -6,7 +6,33 @@ export OPTIMIZE="-Os"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
+apt-get update
+apt-get install -qqy autoconf libtool libpng-dev pkg-config
 
+echo "============================================="
+echo "Compiling libwebp"
+echo "============================================="
+test -n "$SKIP_LIBWEBP" || (
+  cd node_modules/libwebp
+  autoreconf -fiv
+  rm -rf build || true
+  mkdir -p build && cd build
+  emconfigure ../configure \
+    --disable-libwebpdemux \
+    --disable-wic \
+    --disable-gif \
+    --disable-tiff \
+    --disable-jpeg \
+    --disable-png \
+    --disable-sdl \
+    --disable-gl \
+    --disable-threading \
+    --disable-neon-rtcd \
+    --disable-neon \
+    --disable-sse2 \
+    --disable-sse4.1
+  emmake make
+)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -20,9 +46,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_dec.js \
-    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_dec.cpp
+    webp_dec.cpp \
+    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

diff --git a/codecs/webp_dec/package.json b/codecs/webp_dec/package.json
@@ -5,7 +5,7 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.0"
+    "libwebp": "webmproject/libwebp#v1.0.2"
   },
   "devDependencies": {
     "napa": "3.0.0"

diff --git a/codecs/webp_dec/webp_dec.js b/codecs/webp_dec/webp_dec.js
diff --git a/codecs/webp_dec/webp_dec.wasm b/codecs/webp_dec/webp_dec.wasm
diff --git a/codecs/webp_enc/README.md b/codecs/webp_enc/README.md
@@ -1,7 +1,7 @@
 # WebP encoder
 
 - Source: <https://github.com/webmproject/libwebp>
-- Version: v0.6.1
+- Version: v1.0.2
 
 ## Dependencies
 

diff --git a/codecs/webp_enc/build.sh b/codecs/webp_enc/build.sh
@@ -7,6 +7,33 @@ export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
 export CPPFLAGS="${OPTIMIZE}"
 
+apt-get update
+apt-get install -qqy autoconf libtool libpng-dev pkg-config
+
+echo "============================================="
+echo "Compiling libwebp"
+echo "============================================="
+test -n "$SKIP_LIBWEBP" || (
+  cd node_modules/libwebp
+  autoreconf -fiv
+  rm -rf build || true
+  mkdir -p build && cd build
+  emconfigure ../configure \
+    --disable-libwebpdemux \
+    --disable-wic \
+    --disable-gif \
+    --disable-tiff \
+    --disable-jpeg \
+    --disable-png \
+    --disable-sdl \
+    --disable-gl \
+    --disable-threading \
+    --disable-neon-rtcd \
+    --disable-neon \
+    --disable-sse2 \
+    --disable-sse4.1
+  emmake make
+)
 echo "============================================="
 echo "Compiling wasm bindings"
 echo "============================================="
@@ -20,9 +47,9 @@ echo "============================================="
     --std=c++11 \
     -I node_modules/libwebp \
     -o ./webp_enc.js \
-    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
     -x c++ \
-    webp_enc.cpp
+    webp_enc.cpp \
+    node_modules/libwebp/build/src/.libs/libwebp.a
 )
 echo "============================================="
 echo "Compiling wasm bindings done"

diff --git a/codecs/webp_enc/package.json b/codecs/webp_enc/package.json
@@ -5,7 +5,7 @@
     "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
   },
   "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.0"
+    "libwebp": "webmproject/libwebp#v1.0.2"
   },
   "devDependencies": {
     "napa": "3.0.0"

diff --git a/codecs/webp_enc/webp_enc.js b/codecs/webp_enc/webp_enc.js
diff --git a/codecs/webp_enc/webp_enc.wasm b/codecs/webp_enc/webp_enc.wasm
diff --git a/package-lock.json b/package-lock.json