Skip to content

Commit

Permalink
Updated vips to 7.40.11
Browse files Browse the repository at this point in the history
Included libtiff for cedar/cedar-14 version mismatch
  • Loading branch information
alex88 committed Dec 17, 2014
1 parent a94a408 commit 447b076
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
30 changes: 25 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ heroku-buildpack-vips

Heroku buildpack with [libvips](https://github.com/jcupitt/libvips) installed.

Current vips version is 7.40.10 with webp 0.4.0, orc 0.4.18, fftw 3.3.4, libgsf 1.14.30, imagemagick 6.8.9 and lcms 2.6
Current vips version is 7.40.11 with webp 0.4.0, libtiff 4.0.3, orc 0.4.18, fftw 3.3.4, libgsf 1.14.30, imagemagick 6.9.0 and lcms 2.6

## Usage

Expand Down Expand Up @@ -37,15 +37,15 @@ This is the script used to build vips on `heroku run bash`
#!/bin/bash

# Set vips version
export VIPS_VERSION=7.40.10
export VIPS_VERSION=7.40.11
export WEBP_VERSION=0.4.0
export ORC_VERSION=0.4.18
export FFTW_VERSION=3.3.4
export GETTEXT_VERSION=0.19.1
export BUILD_PATH=/tmp
export OUT_PATH=/app/vendor/vips
export PKG_CONFIG_PATH=$OUT_PATH/lib/pkgconfig:$PKG_CONFIG_PATH
export PATH=$PATH:$OUT_PATH/bin
export PATH=$OUT_PATH/bin:$PATH

# Remove out path if already exists
rm -Rf $OUT_PATH
Expand Down Expand Up @@ -95,6 +95,26 @@ make install
# Build path
cd $BUILD_PATH

###############
# LIBTIFF #
###############

# Download tiff dependency
curl http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz -o libtiff.tar.gz
# Unzip
tar -xvf libtiff.tar.gz
# Get into libtiff folder
cd tiff-4.0.3
# Configure build
./configure --prefix $OUT_PATH
# Make libtiff
make
# Install libtiff
make install

# Build path
cd $BUILD_PATH

###############
# FFTW #
###############
Expand Down Expand Up @@ -257,11 +277,11 @@ cd $BUILD_PATH
###############

# Download Imagemagick dependency
curl -L http://www.imagemagick.org/download/ImageMagick-6.8.9-8.tar.xz -o ImageMagick.tar.xz
curl -L http://www.imagemagick.org/download/releases/ImageMagick-6.9.0-0.tar.xz -o ImageMagick.tar.xz
# Unzip
tar -xvf ImageMagick.tar.xz
# Get into Imagemagick folder
cd ImageMagick-6.8.9-8
cd ImageMagick-6.9.0-0
# Configure build
./configure --prefix $OUT_PATH
# Make Imagemagick
Expand Down
4 changes: 2 additions & 2 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ mkdir -p $output_dir
mkdir -p $temp_app_dir

echo "Downloading libvips and unpacking" | indent
curl -s https://s3-eu-west-1.amazonaws.com/visup-misc/heroku-buildpack-vips/201410031030.tar.gz | tar xz -C $output_dir
curl -s https://s3-eu-west-1.amazonaws.com/visup-misc/heroku-buildpack-vips/201412171200.tar.gz | tar xz -C $output_dir

if [ $? != 0 ]; then
echo "Error downloading vips and unpacking to build dir" | indent
exit 1
fi

curl -s https://s3-eu-west-1.amazonaws.com/visup-misc/heroku-buildpack-vips/201410031030.tar.gz | tar xz -C $temp_app_dir
curl -s https://s3-eu-west-1.amazonaws.com/visup-misc/heroku-buildpack-vips/201412171200.tar.gz | tar xz -C $temp_app_dir

if [ $? != 0 ]; then
echo "Error downloading vips and unpacking to app dir" | indent
Expand Down

2 comments on commit 447b076

@jonathanong
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

@alex88
Copy link
Owner Author

@alex88 alex88 commented on 447b076 Dec 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yw 👍

Please sign in to comment.