summaryrefslogtreecommitdiff
path: root/package/ImageMagick/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-11-29 16:06:00 +0100
commit8e8512391c668fc7074f812f15eabe8f176fb01e (patch)
treef9f0862dd6eb962fe3fc4803180b431843f6c5be /package/ImageMagick/Makefile
parentc491653a1f9574a42965025805d472c3d145f699 (diff)
parentae3d4616ed9c19a29d656193254657f93d612fa2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ImageMagick/Makefile')
-rw-r--r--package/ImageMagick/Makefile10
1 files changed, 7 insertions, 3 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 2ede37ebc..5f03351c2 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -6,15 +6,19 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= ImageMagick
PKG_VERSION:= 6.7.6
PKG_EXTRAVER:= 1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 8134257e3fbb43cc06fb32a6d725d3d0
PKG_DESCR:= image processing and converting utility
PKG_SECTION:= multimedia
-PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv libtool e2fsprogs
+PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv-tiny libtool e2fsprogs
PKG_BUILDDEP+= pango
PKG_URL:= http://www.imagemagick.org/
PKG_SITES:= http://image_magick.veidrodis.com/image_magick/
PKG_NEED_CXX:= 1
+PKG_LIBNAME:= libimagemagic
+PKG_OPTS:= dev
+
+PKG_ARCH_DEPENDS:= !m68k
PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK
PKGSD_LIBIMAGEMAGICK:= imagemagick library
@@ -33,7 +37,7 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION}-${PKG_EXTRAVER}
include $(TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK}))
+$(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBIMAGEMAGICK},${PKGSC_LIBIMAGEMAGICK},${PKG_OPTS}))
$(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
$(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))