install apngasm

3 files changed, 21 insertions, 2 deletions

diff --git a/.travis.sh b/.travis.sh
index c494ee6..df76757 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -14,6 +14,8 @@ case "$1" in
     curl http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz | tar -xz
     curl http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2 | tar -xj
     curl http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 | tar -xj
+    curl -L http://downloads.sourceforge.net/project/apngasm/2.8/apngasm-2.8-src.zip -O
+    unzip apngasm-2.8-src.zip apngasm.c
 
     curl http://dl.katawa-shoujo.com/gold_1.1/%5B4ls%5D_katawa_shoujo_1.1-%5Blinux-x86%5D%5BB5C707D5%5D.tar.bz2 | tar -xj --strip-components 2 --wildcards "Katawa Shoujo-linux-x86/game/script-a*.rpyc" "Katawa Shoujo-linux-x86/game/imachine.rpyc" "Katawa Shoujo-linux-x86/game/ui-strings*.rpyc" "Katawa Shoujo-linux-x86/game/data.rpa"
     mv *.rpyc unrpyc
@@ -60,6 +62,23 @@ case "$1" in
     sudo make $MAKEOPTS install >/dev/null
     cd ..
 
+    cd apngasm-2.8
+    patch -p1 <<-EOF
+    --- apngasm.c
+    +++ apngasm.c
+    @@ -29,6 +29,7 @@
+      */^M
+     #include <stdio.h>^M
+     #include <stdlib.h>^M
+    +#include <string.h>^M
+     #include "png.h"     /* original (unpatched) libpng is ok */^M
+     #include "zlib.h"^M
+     ^M
+    EOF
+    make LDLIBS="$(pkg-config --libs libpng --libs zlib)" apngasm
+    install -c -m755 apngasm /usr/local/bin
+    cd ..
+
     cd ffmpeg
     ./configure --disable-everything --disable-logging --disable-programs --disable-runtime-cpudetect --enable-decoder=mpeg4 --enable-decoder=pcm_s16le --enable-decoder=vorbis --enable-decoder=rawvideo --enable-demuxer=matroska --enable-demuxer=ogg --enable-demuxer=wav --enable-demuxer=yuv4mpegpipe --enable-encoder=libfdk_aac --enable-encoder=libopus --enable-encoder=libtheora --enable-encoder=libvpx_vp8 --enable-encoder=libvpx_vp9 --enable-encoder=libx264 --enable-encoder=pcm_s16le --enable-encoder=rawvideo --enable-ffmpeg --enable-filter=aresample --enable-gpl --enable-hardcoded-tables --enable-libfdk_aac --enable-libopus --enable-libtheora --enable-libvpx --enable-libx264 --enable-muxer=ipod --enable-muxer=mp4 --enable-muxer=ogg --enable-muxer=wav --enable-muxer=webm --enable-muxer=yuv4mpegpipe --enable-nonfree --enable-protocol=file
     make $MAKEOPTS >/dev/null
diff --git a/Modernizr b/Modernizr
-Subproject a14fa9d7f203478330a80badd154b90b5a1566c
+Subproject 96b3e677965b33e4af227d573da69775f2ad480
diff --git a/README.rst b/README.rst
index 33254bc..94b9c94 100644
--- a/README.rst
+++ b/README.rst
@@ -23,8 +23,8 @@ Requirements
 - cwebp and webpmux from libwebp
 - convert from ImageMagick
 - apngasm
-- uglifyjs
-- Node.js, npm, grunt
+- Node.js, npm
+- uglifyjs installed globally
 
 Recommended
 '''''''''''