diff options
| -rw-r--r-- | imagemagick-nox/ChangeLog | 57 | ||||
| -rw-r--r-- | imagemagick-nox/ImageMagick-6.6.1-4.tar.xz.part | 0 | ||||
| -rw-r--r-- | imagemagick-nox/PKGBUILD | 80 |
3 files changed, 97 insertions, 40 deletions
diff --git a/imagemagick-nox/ChangeLog b/imagemagick-nox/ChangeLog index f35cadc..1f17dc9 100644 --- a/imagemagick-nox/ChangeLog +++ b/imagemagick-nox/ChangeLog @@ -1,3 +1,60 @@ +2010-03-30 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.6.0.10-1 + * Upstream update + * Removed bootstrapping to fix linking problem (no longer necessary) + * Enabled modules, some depends are now optdepends + +2010-02-26 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.6.0.0-1 + * Upstream update + +2010-02-14 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.9.5-1 + * Upstream update + +2010-01-18 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.9.0-2 + * Fixed undefined symbols + +2010-01-14 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.9.0-1 + * Upstream update + +2009-12-12 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.8.5-1 + * Upstream update + +2009-11-22 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.7.10-1 + * Upstream update + +2009-11-08 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.7.5-1 + * Upstream update + +2009-10-14 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.6.10-1 + * Upstream update + +2009-09-18 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.6.1-1 + * Upstream update + +2009-09-02 Eric Belanger <eric@archlinux.org> + + * imagemagick 6.5.5.6-1 + * Upstream update + 2009-08-05 Eric Belanger <eric@archlinux.org> * imagemagick 6.5.4.8-1 diff --git a/imagemagick-nox/ImageMagick-6.6.1-4.tar.xz.part b/imagemagick-nox/ImageMagick-6.6.1-4.tar.xz.part new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/imagemagick-nox/ImageMagick-6.6.1-4.tar.xz.part diff --git a/imagemagick-nox/PKGBUILD b/imagemagick-nox/PKGBUILD index b6aecb0..6c50c56 100644 --- a/imagemagick-nox/PKGBUILD +++ b/imagemagick-nox/PKGBUILD @@ -1,54 +1,54 @@ -# $Id$ -# Maintainer: Eric Belanger <eric@archlinux.org> - -# NOTE: 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 -# Just uninstalling ImageMagick before build fails as it is used during the build processs +# $Id: PKGBUILD 78139 2010-04-19 22:08:32Z dgriffiths $ +# Contributor: Eric Belanger <eric@archlinux.org> +# imagemagick Maintainer: DAniel J Griffiths <ghost1227@archlinux.us> +# imagemagick-nox Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=imagemagick-nox -pkgver=6.6.0.9 +pkgver=6.6.3.2 pkgrel=1 pkgdesc="An image viewing/manipulation program, without X dependencies" arch=('i686' 'x86_64') url="http://www.imagemagick.org/" license=('custom') -depends=('lcms>=1.18-2' 'gcc-libs' 'openexr>=1.6.1' 'libtool>=2.2' 'heimdal>=1.2.1' 'bzip2' 'libxml2') +depends=('lcms' 'gcc-libs' 'openexr>=1.6.1' 'libtool' 'heimdal' 'bzip2' 'libxml2' 'liblqr') +makedepends=('imagemagick-nox') provides=('imagemagick') options=('!makeflags' '!docs') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \ - libpng_mmx_patch_x86_64.patch add_delegate.patch perlmagick.rpath.patch) +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + libpng_mmx_patch_x86_64.patch + perlmagick.rpath.patch) 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 - patch -p0 < ../perlmagick.rpath.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 \ - --without-x --without-wmf --with-openexr --with-xml \ - --without-gslib --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --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 || return 1 + fi + + patch -p0 < ../perlmagick.rpath.patch || return 1 + + ./configure --prefix=/usr --with-modules --disable-static \ + --enable-openmp --without-x --without-wmf --with-openexr --with-xml \ + --without-gslib \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --with-jp2 \ + --without-jbig --without-fpx --without-dps || return 1 + make || return 1 +} + +package() { + cd ${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.} + + make DESTDIR=${pkgdir} install || return 1 + + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + install -Dm644 NOTICE ${pkgdir}/usr/share/licenses/${pkgname}/NOTICE || return 1 + + #Cleaning + find ${pkgdir} -name '*.bs' -exec rm {} \; || return 1 + rm -f ${pkgdir}/usr/lib/*.la || return 1 } -md5sums=('c04030c3d4649bee4d6a891a16e031a3' + +md5sums=('b77b48d36b3529e8113090b12039e914' '069980fc2590c02aed86420996259302' - '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb') |