diff options
| -rw-r--r-- | abs/core-testing/imagemagick/ChangeLog | 106 | ||||
| -rw-r--r-- | abs/core-testing/imagemagick/PKGBUILD | 93 | ||||
| -rw-r--r-- | abs/core-testing/imagemagick/add_delegate.patch | 8 | ||||
| -rw-r--r-- | abs/core-testing/imagemagick/perlmagick.rpath.patch | 10 |
4 files changed, 59 insertions, 158 deletions
diff --git a/abs/core-testing/imagemagick/ChangeLog b/abs/core-testing/imagemagick/ChangeLog deleted file mode 100644 index a3b253a..0000000 --- a/abs/core-testing/imagemagick/ChangeLog +++ /dev/null @@ -1,106 +0,0 @@ -2009-02-27 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.9.7-1 - * Upstream update - -2009-02-07 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.9.2-1 - * Upstream update - -2009-01-30 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.8.10-1 - * Upstream update - -2008-12-29 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.8.2-1 - * Upstream update - -2008-12-14 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.7.8-1 - * Upstream update - -2008-12-05 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.7.0-1 - * Upstream update - * Rebuild against heimdal 1.2.1 - -2008-11-25 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.6.3-1 - * Upstream update - -2008-11-14 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.5.6-1 - * Upstream update - -2008-10-26 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.5.0-1 - * Upstream update - -2008-10-18 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.4.9-1 - * Upstream update - -2008-10-03 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.4.1-1 - * Upstream update - -2008-09-06 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.3.6-1 - * Upstream update - * Added JPEG2000 support (close FS#10544) - -2008-08-19 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.2.10-1 - * Upstream update - -2008-08-11 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.2.7-1 - * Upstream update - * Added bzip2 and libxml2 depends - * Disabled docs - -2008-07-18 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.2.4-1 - * Upstream update - -2008-06-23 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.2.1-1 - * Upstream update - * Fixed linking problem (close FS#10574) - -2008-05-19 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.1.3-1 - * Upstream update - -2008-04-30 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.1.0-1 - * Upstream update - -2008-04-24 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.0.9-1 - * Upstream update - -2008-03-29 Eric Belanger <eric@archlinux.org> - - * imagemagick 6.4.0.2-1 - * Upstream update - * Added dvips to delegates list for dvi support (close FS#8914) - * Added ChangeLog diff --git a/abs/core-testing/imagemagick/PKGBUILD b/abs/core-testing/imagemagick/PKGBUILD index e79c46b..2a797c7 100644 --- a/abs/core-testing/imagemagick/PKGBUILD +++ b/abs/core-testing/imagemagick/PKGBUILD @@ -1,53 +1,58 @@ -# $Id: PKGBUILD 28186 2009-02-28 05:23:34Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -# NOTE: ImageMagick builds against an existing installation -# uninstall ImageMagick before building, or build it, install it, build it. - -# NOTE 2: To circumvent linking problems (FS#10574), this package must now be built the following way: -# install old package, build new package, install new package, rebuild +# $Id: PKGBUILD 90849 2010-09-18 00:00:00Z eric $ +# Contributor: Eric Belanger <eric@archlinux.org> +# Maintainer: DAniel J Griffiths <ghost1227@archlinux.us> pkgname=imagemagick -pkgver=6.4.9.10 -pkgrel=6 +pkgver=6.6.4.3 +pkgrel=1 pkgdesc="An image viewing/manipulation program" arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('libjpeg' 'lcms' 'libwmf' 'librsvg' 'libxt' 'gcc-libs' 'ghostscript' 'openexr>=1.6.1' 'libtool>=2.2' 'heimdal>=1.2.1' 'bzip2' 'libxml2' 'jasper') -#makedepends=('ghostscript' 'openexr') -options=('!makeflags' '!docs') -source=(ftp://ftp.fifi.org/pub/ImageMagick/legacy/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 - #ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \ - libpng_mmx_patch_x86_64.patch add_delegate.patch) +depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'freetype2' 'fontconfig' 'libxext') +makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') +optdepends=('ghostscript: for Ghostscript support' + 'openexr: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support') +options=('!makeflags' '!docs' 'force') +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + libpng_mmx_patch_x86_64.patch + perlmagick.rpath.patch) +md5sums=('be87050ec143205326f2e9fbbc7da03a' '069980fc2590c02aed86420996259302'\ + 'ff9974decbfe9846f8e347239d87e4eb') +sha1sums=('9f6c800560998b6a5e96b1a62d2b13140de9d1d7' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\ + '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { - cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.} - - if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 < ../libpng_mmx_patch_x86_64.patch || return 1 - fi - - patch -p0 < ../add_delegate.patch || return 1 - sed -i "s/with_autotrace='no'/with_autotrace='yes'/" configure || return 1 - - # When there is a soname bump, remove 'LIBS=-lMagickWand' from configure line and build/install. Then, readd 'LIBS=-lMagickWand' and build/install twice. - LIBS=-lMagickWand ./configure --prefix=/usr --without-modules --disable-static --enable-openmp \ - --with-x --with-wmf --with-openexr --with-xml \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --with-jp2 \ - --without-jbig --without-fpx --without-dps || return 1 - - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - install -D -m644 NOTICE ${pkgdir}/usr/share/licenses/${pkgname}/NOTICE || return 1 - - #Cleaning - find ${pkgdir} -name '*.bs' -exec rm {} \; || return 1 - find ${pkgdir} -name '.packlist' -exec rm {} \; || return 1 - find ${pkgdir} -name 'perllocal.pod' -exec rm {} \; || return 1 - - rm -f ${pkgdir}/usr/lib/*.la || return 1 + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + + if [ "${CARCH}" = 'x86_64' ]; then + patch -Np1 < ../libpng_mmx_patch_x86_64.patch + fi + + patch -p0 < ../perlmagick.rpath.patch + + ./configure --prefix=/usr --with-modules --disable-static \ + --enable-openmp --with-x --with-wmf --with-openexr --with-xml \ + --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --with-jp2 \ + --without-jbig --without-fpx --without-dps + make +} + +package() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + + make DESTDIR="${pkgdir}" install + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" + + #Cleaning + find "${pkgdir}" -name '*.bs' -exec rm {} \; + rm -f "${pkgdir}"/usr/lib/*.la } diff --git a/abs/core-testing/imagemagick/add_delegate.patch b/abs/core-testing/imagemagick/add_delegate.patch deleted file mode 100644 index 6ba6009..0000000 --- a/abs/core-testing/imagemagick/add_delegate.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- config/delegates.xml.in.orig 2008-03-29 23:25:03.000000000 -0400 -+++ config/delegates.xml.in 2008-03-29 23:27:35.000000000 -0400 -@@ -103,4 +103,5 @@ - <delegate decode="xps:color" stealth="True" command=""@XPSDelegate@" -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 "-sDEVICE=@XPSColorDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/> - <delegate decode="xps:cmyk" stealth="True" command=""@XPSDelegate@" -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 "-sDEVICE=@XPSCMYKDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/> - <delegate decode="xps:mono" stealth="True" command=""@XPSDelegate@" -dQUIET -dPARANOIDSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=0 "-sDEVICE=@XPSMonoDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/> -+ <delegate decode="dvi" command=""dvips" -q -o "%o" "%i""/> - </delegatemap> diff --git a/abs/core-testing/imagemagick/perlmagick.rpath.patch b/abs/core-testing/imagemagick/perlmagick.rpath.patch new file mode 100644 index 0000000..958c0f2 --- /dev/null +++ b/abs/core-testing/imagemagick/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 ++++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 +@@ -10067,6 +10067,7 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install |