diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-07 21:27:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-07 21:27:26 -0300 |
| commit | 0363d5073b581f7d98910a93440d70b98ba29b53 (patch) | |
| tree | a0ed8bf924f7a5c0b35d499edb45954cc215509c /extra/imagemagick | |
| parent | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (diff) | |
| parent | b0145a13655cdf02f228f07b376e58a825e28b78 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ude/PKGBUILD
Diffstat (limited to 'extra/imagemagick')
| -rw-r--r-- | extra/imagemagick/PKGBUILD | 21 | ||||
| -rw-r--r-- | extra/imagemagick/libpng_mmx_patch_x86_64.patch | 12 |
2 files changed, 8 insertions, 25 deletions
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index e2d60340b..b5468a0c5 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119490 2011-04-11 18:49:40Z jgc $ +# $Id: PKGBUILD 122661 2011-05-05 21:34:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.6.9.4 +pkgver=6.6.9.8 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,24 +12,18 @@ depends=('libtool' 'lcms' 'libxt' 'gcc-libs' 'bzip2' 'xz' 'freetype2' 'fontconfi 'libxext' 'libjpeg-turbo') makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - libpng_mmx_patch_x86_64.patch perlmagick.rpath.patch) -md5sums=('e9355aa38daa1d2c42d7e37108bc0dfa' - '069980fc2590c02aed86420996259302' + perlmagick.rpath.patch) +md5sums=('8cd5fe2bc5a29b38c24a6f9576518319' 'ff9974decbfe9846f8e347239d87e4eb') -sha1sums=('e3cbf6d61bf29ec8be6796c89b04f10495a6e52d' - 'e42f3acbe85b6098af75c5cecc9a254baaa0482c' +sha1sums=('f5fb5844934e23bffbd0ab2a36ea4914eab0dcd0' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - if [ "${CARCH}" = 'x86_64' ]; then - patch -Np1 -i ../libpng_mmx_patch_x86_64.patch - fi - - patch -Np0 -i ../perlmagick.rpath.patch sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf + patch -Np0 -i ../perlmagick.rpath.patch ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --enable-openmp --with-wmf --with-openexr --with-xml \ @@ -62,10 +56,11 @@ package_imagemagick() { 'etc/ImageMagick/type-dejavu.xml' 'etc/ImageMagick/type-ghostscript.xml' 'etc/ImageMagick/type-windows.xml') - options=('!makeflags' '!docs') + options=('!makeflags' '!docs' 'libtool') cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} make DESTDIR="${pkgdir}" install + chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" diff --git a/extra/imagemagick/libpng_mmx_patch_x86_64.patch b/extra/imagemagick/libpng_mmx_patch_x86_64.patch deleted file mode 100644 index d86449a28..000000000 --- a/extra/imagemagick/libpng_mmx_patch_x86_64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ImageMagick-6.2.7.orig/coders/png.c ImageMagick-6.2.7/coders/png.c ---- ImageMagick-6.2.7.orig/coders/png.c 2006-05-21 12:35:55.784852536 +0200 -+++ ImageMagick-6.2.7/coders/png.c 2006-05-21 12:36:50.698504392 +0200 -@@ -164,6 +164,8 @@ - #define PNG_MAX_UINT (png_uint_32) 0x7fffffffL - #endif - -+#undef PNG_ASSEMBLER_CODE_SUPPORTED -+ - /* - Constant strings for known chunk types. If you need to add a chunk, - add a string holding the name here. To make the code more |