summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-12 07:42:09 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2009-01-12 07:42:09 +0000
commit728164ff1664f00d4b168ef00c34156e646bb7eb (patch)
tree56e708651f59703c4543a88c5fe98c1284725141
parenta51ee4995ce9ca50b3cf3098b403c04ae939093e (diff)
Bump version of ImageMagick which does not work, use versioned patches, needs further work to complete build
-rw-r--r--package/imagemagick/imagemagick.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index cce85e93f..5748c8f20 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -3,8 +3,8 @@
# imagemagick
#
#############################################################
-IMAGEMAGICK_VERSION:=6.3.7
-IMAGEMAGICK_SOURCE:=ImageMagick.tar.bz2
+IMAGEMAGICK_VERSION:=6.4.8-4
+IMAGEMAGICK_SOURCE:=ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
IMAGEMAGICK_SITE:=ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_DIR:=$(BUILD_DIR)/ImageMagick-$(IMAGEMAGICK_VERSION)
IMAGEMAGICK_CAT:=$(BZCAT)
@@ -28,7 +28,7 @@ $(DL_DIR)/$(IMAGEMAGICK_SOURCE):
$(IMAGEMAGICK_DIR)/.unpacked: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
$(IMAGEMAGICK_CAT) $(DL_DIR)/$(IMAGEMAGICK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-\*.patch\*
+ toolchain/patch-kernel.sh $(IMAGEMAGICK_DIR) package/imagemagick/ imagemagick-$(IMAGEMAGICK_VERSION)\*.patch\*
$(CONFIG_UPDATE) $(IMAGEMAGICK_DIR)/config
touch $@
@@ -133,6 +133,8 @@ imagemagick: uclibc jpeg tiff $(IMAGEMAGICK_LIB) \
imagemagick-source: $(DL_DIR)/$(IMAGEMAGICK_SOURCE)
+imagemagick-unpacked:$(IMAGEMAGICK_DIR)/.unpacked
+
imagemagick-clean:
rm -f $(TARGET_DIR)/$(IMAGEMAGICK_TARGET_BINARY)
rm -f $(TARGET_DIR)/usr/bin/animate