From 38425cc0246c05fc3b65c78d9fe6e6206ef2e99f Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Jun 2015 11:14:48 +0200
Subject: update ImageMagick to latest stable version

---
 package/ImageMagick/Makefile                | 27 ++++++++++++---------------
 package/ImageMagick/patches/patch-configure | 11 -----------
 2 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100644 package/ImageMagick/patches/patch-configure

(limited to 'package/ImageMagick')

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index e9abad1e0..5e5bfa08d 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -4,22 +4,23 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		ImageMagick
-PKG_VERSION:=		6.7.6
-PKG_EXTRAVER:=		1
-PKG_RELEASE:=		3
-PKG_HASH:=		a83847198c7354a8fcf68f1e9b3ac7ddc7ccd21aa525761e93ed522af31d69fa
+PKG_VERSION:=		6.9.1
+PKG_EXTRAVER:=		3
+PKG_RELEASE:=		1
+PKG_HASH:=		5fd180603e60c624c05c644a8340f4f4e92c19dc3c41d374d38f76c69cd48ba3
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		mm/image
 PKG_DEPENDS:=		libstdcxx
 PKG_BUILDDEP:=		libpng libjpeg-turbo libtiff fontconfig
 PKG_BUILDDEP+=		pango libtool e2fsprogs
 PKG_URL:=		http://www.imagemagick.org/
-PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
+PKG_SITES:=		http://www.imagemagick.org/download/
 PKG_LIBNAME:=		libimagemagick
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!m68k
 PKG_BUILDDEP_UCLIBC:=	libiconv-tiny
+PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
 
 PKG_SUBPKGS:=		CONVERT DISPLAY LIBIMAGEMAGICK
 PKGSD_LIBIMAGEMAGICK:=	imagemagick library
@@ -33,7 +34,7 @@ PKGSC_DISPLAY:=		mm/image
 PKGSS_DISPLAY:=		libimagemagick libX11 libXau libXdmcp libICE libSM fontconfig libXt zlib libpng libltdl
 PKGSB_DISPLAY:=		libX11
 
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.gz
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}.tar.xz
 WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -59,16 +60,12 @@ CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
 			--enable-fast-install
 
 libimagemagick-install:
-	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib
-	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
-	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \
-		$(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
-	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}
-	$(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/* \
-		$(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/
-	$(CP) $(WRKINST)/usr/lib/libMagickCore.so* \
+	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}
+	$(CP) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/* \
+		$(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/
+	$(CP) $(WRKINST)/usr/lib/libMagickCore*.so* \
 		$(IDIR_LIBIMAGEMAGICK)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libMagickWand.so* \
+	$(CP) $(WRKINST)/usr/lib/libMagickWand*.so* \
 		$(IDIR_LIBIMAGEMAGICK)/usr/lib
 
 convert-install:
diff --git a/package/ImageMagick/patches/patch-configure b/package/ImageMagick/patches/patch-configure
deleted file mode 100644
index 8989a773a..000000000
--- a/package/ImageMagick/patches/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- ImageMagick-6.6.5-10.orig/configure	2010-11-21 22:36:46.000000000 +0100
-+++ ImageMagick-6.6.5-10/configure	2011-05-06 06:37:19.000000000 +0200
-@@ -24079,7 +24079,7 @@ fi
- 
- # Assume that delegate headers reside under same directory as ImageMagick
- # installation prefix.
--MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
-+#MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS"
- 
- #
- # Find the X11 RGB database
-- 
cgit v1.2.3