Merge 2633050b91 into 30979d4dd4

.travis.yml

@@ -16,16 +16,13 @@ python:
   - 3.4
 
 install:
-  - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick lcov"
+  - "sudo apt-get -qq install libfreetype6-dev liblcms2-dev python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick lcov libwebp-dev"
   - "pip install cffi"
   - "pip install coveralls nose coveralls-merge"
   - "gem install coveralls-lcov"
   - travis_retry pip install pyroma
   - if [ "$TRAVIS_PYTHON_VERSION" == "2.6" ]; then pip install unittest2; fi
 
-  # webp
-  - pushd depends && ./install_webp.sh && popd
-
   # openjpeg
   - pushd depends && ./install_openjpeg.sh && popd
 

depends/install_webp.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-# install webp
-
-
-if [ ! -f libwebp-0.4.0.tar.gz ]; then
-    wget 'https://webp.googlecode.com/files/libwebp-0.4.0.tar.gz'
-fi
-
-rm -r libwebp-0.4.0
-tar -xvzf libwebp-0.4.0.tar.gz
-
-
-pushd libwebp-0.4.0 
-
-./configure --prefix=/usr --enable-libwebpmux --enable-libwebpdemux && make && sudo make install
-
-popd
-