summaryrefslogtreecommitdiff
path: root/package/ImageMagick
diff options
context:
space:
mode:
Diffstat (limited to 'package/ImageMagick')
-rw-r--r--package/ImageMagick/Makefile53
-rw-r--r--package/ImageMagick/patches/patch-config_ltmain_sh39
-rw-r--r--package/ImageMagick/patches/patch-configure11
3 files changed, 27 insertions, 76 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
diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh
deleted file mode 100644
index 9ca2a4a6c..000000000
--- a/package/ImageMagick/patches/patch-config_ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- ImageMagick-6.6.5-10.orig/config/ltmain.sh 2010-11-21 22:35:22.000000000 +0100
-+++ ImageMagick-6.6.5-10/config/ltmain.sh 2011-01-14 00:59:45.000000000 +0100
-@@ -5091,7 +5091,7 @@ func_mode_link ()
- # @file GCC response files
- # -tp=* Portland pgcc target processor selection
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
-@@ -5843,27 +5843,6 @@ func_mode_link ()
- esac
- fi
-
-- # Hardcode the library path.
-- # Skip directories that are in the system default run-time
-- # search path.
-- case " $sys_lib_dlsearch_path " in
-- *" $absdir "*) ;;
-- *)
-- case "$compile_rpath " in
-- *" $absdir "*) ;;
-- *) compile_rpath="$compile_rpath $absdir"
-- esac
-- ;;
-- esac
-- case " $sys_lib_dlsearch_path " in
-- *" $libdir "*) ;;
-- *)
-- case "$finalize_rpath " in
-- *" $libdir "*) ;;
-- *) finalize_rpath="$finalize_rpath $libdir"
-- esac
-- ;;
-- esac
- fi # $linkmode,$pass = prog,link...
-
- if test "$alldeplibs" = yes &&
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
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 17:47:57 +0000