Mercurial > mxe-octave

changeset 2226:5edcb1f916a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package imagemagick: build without zlib 1.2.6 due to incompatibility
author Mark Brand <mabrand@mabrand.nl>
date Mon, 30 Jan 2012 15:10:26 +0100
parents ad1e636bd55b
children f3d0fe4cc136
files src/imagemagick.mk
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/imagemagick.mk	Mon Jan 30 15:07:51 2012 +0100
+++ b/src/imagemagick.mk	Mon Jan 30 15:10:26 2012 +0100
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := ImageMagick-$($(PKG)_VERSION).tar.xz
 $(PKG)_WEBSITE  := http://www.imagemagick.org/
 $(PKG)_URL      := http://ftp.nluug.nl/ImageMagick/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff zlib
+$(PKG)_DEPS     := gcc bzip2 ffmpeg fftw freetype jasper jpeg lcms libpng libtool openexr pthreads tiff
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://www.imagemagick.org/' | \
@@ -25,7 +25,9 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --disable-shared \
         --with-x=no \
+        --without-zlib \
         ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config'
+    $(SED) -i 's/#define MAGICKCORE_ZLIB_DELEGATE 1//g' '$(1)/magick/magick-config.h'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS=
 endef