diff options
Diffstat (limited to 'package/ImageMagick/Makefile')
| -rw-r--r-- | package/ImageMagick/Makefile | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 2f50ddf20..aca4f647f 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -1,42 +1,46 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ImageMagick -PKG_VERSION:= 6.6.5 -PKG_EXTRAVER:= 10 +PKG_VERSION:= 7.1.1 +PKG_EXTRAVER:= 29 PKG_RELEASE:= 1 -PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f +PKG_HASH:= f140465fbeb0b4724cba4394bc6f6fb32715731c1c62572d586f4f1c8b9b0685 PKG_DESCR:= image processing and converting utility -PKG_SECTION:= multimedia -PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv libtool e2fsprogs +PKG_SECTION:= mm/image +PKG_BUILDDEP:= libpng libjpeg-turbo libtiff fontconfig +PKG_BUILDDEP+= pango libtool e2fsprogs +PKG_NEEDS:= c++ PKG_URL:= http://www.imagemagick.org/ -PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ -PKG_NEED_CXX:= 1 +PKG_SITES:= http://www.imagemagick.org/download/releases/ +PKG_LIBNAME:= libimagemagick +PKG_OPTS:= dev + +PKG_ARCH_DEPENDS:= !m68k PKG_SUBPKGS:= CONVERT DISPLAY LIBIMAGEMAGICK PKGSD_LIBIMAGEMAGICK:= imagemagick library -PKGSC_LIBIMAGEMAGICK:= libs -PKGSS_LIBIMAGEMAGICK:= libjpeg libtiff +PKGSC_LIBIMAGEMAGICK:= libs/image +PKGSS_LIBIMAGEMAGICK:= libjpeg-turbo libtiff libpng PKGSD_CONVERT:= image processing and converting utility -PKGSC_CONVERT:= multimedia +PKGSC_CONVERT:= mm/image PKGSS_CONVERT:= libimagemagick PKGSD_DISPLAY:= image display application -PKGSC_DISPLAY:= multimedia +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 $(TOPDIR)/mk/package.mk +include $(ADK_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})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ENV+= ac_cv_sys_file_offset_bits=yes CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-gslib \ @@ -47,22 +51,19 @@ CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-lcms2 \ --without-wmf \ --without-xml \ + --without-lzma \ --with-jpeg \ --with-png \ --with-tiff \ --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}/config - $(INSTALL_DATA) $(WRKINST)/usr/share/${PKG_NAME}-${PKG_VERSION}/config/* \ - $(IDIR_LIBIMAGEMAGICK)/usr/share/${PKG_NAME}-${PKG_VERSION}/config - $(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: @@ -73,4 +74,4 @@ display-install: $(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/display $(IDIR_DISPLAY)/usr/bin -include ${TOPDIR}/mk/pkg-bottom.mk +include ${ADK_TOPDIR}/mk/pkg-bottom.mk |