asdf

1 files changed, 23 insertions, 17 deletions

diff --git a/.travis.sh b/.travis.sh
index adc4461..2e0e509 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,56 +2,62 @@
 
 set -e -x
 
-uname -a
-
 case "$1" in
   before_install)
     sudo apt-get update -q
 
     curl http://nodejs.org/dist/node-latest.tar.gz | tar -xz
+    curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
     curl -L http://downloads.sourceforge.net/project/opencore-amr/fdk-aac/fdk-aac-0.1.3.tar.gz | tar -xz
     curl http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz | tar -xz
     curl http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2 | tar -xj
-    curl https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz | tar -xz
 
     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
     ;;
   install)
-    MAKEOPTS="-j`nproc`"
+    MAKEOPTS="-j`nproc` -s"
 
-    sudo apt-get install -q libssl-dev libtheora-dev libvpx-dev libx264-dev yasm zlib1g-dev
+    sudo apt-get install -q libtheora-dev libvpx-dev libx264-dev yasm
+
+    cd libwebp-0.4.0
+    sed -i -e '/unset ac_cv_header_GL_glut_h/d' configure
+    ac_cv_header_gif_lib_h=no \
+    ac_cv_header_tiffio_h=no \
+    ac_cv_header_GL_glut_h=no \
+    ./configure --disable-shared --disable-dependency-tracking --enable-libwebpmux
+    make $MAKEOPTS
+    sudo make $MAKEOPTS install
+    which cwebp
+    cwebp
+    which webpmux
+    webpmux
+    cd ..
 
     cd node-v*
     ./configure --openssl-use-sys --shared-zlib
     make $MAKEOPTS
-    sudo make install
+    sudo make $MAKEOPTS install
     cd ..
 
     sudo npm install -g uglify-js
 
     cd fdk-aac-0.1.3
-    ./configure --disable-shared --disable-dependency-tracking
+    ./configure --disable-shared --disable-dependency-tracking --quiet
     make $MAKEOPTS
-    sudo make install
+    sudo make $MAKEOPTS install
     cd ..
 
     cd opus-1.1
-    ./configure --disable-shared --disable-extra-programs --disable-dependency-tracking
+    ./configure --disable-shared --disable-extra-programs --disable-dependency-tracking --quiet
     make $MAKEOPTS
-    sudo make install
+    sudo make $MAKEOPTS install
     cd ..
 
     cd ffmpeg
     ./configure --disable-everything --disable-programs --disable-runtime-cpudetect --enable-decoder=mpeg4 --enable-decoder=pcm_s16le --enable-decoder=vorbis --enable-demuxer=matroska --enable-demuxer=ogg --enable-demuxer=wav --enable-encoder=huffyuv --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
-    sudo make install
-    cd ..
-
-    cd libwebp-0.4.0
-    ./configure
-    make $MAKEOPTS
-    sudo make install
+    sudo make $MAKEOPTS install
     cd ..
 
     curl https://raw.github.com/Lattyware/unrpa/master/unrpa | python2 - -p www/dump -m data.rpa