[arch-commits] Commit in imagemagick/trunk (PKGBUILD libpng_mmx_patch_x86_64.patch)

[Eric Bélanger]

    Date: Thursday, May 5, 2011 @ 17:34:04
  Author: eric
Revision: 122661

upgpkg: imagemagick 6.6.9.8-1
Upstream update, Fixed rpath, Removed old patch, Fixed permissions on Magick.so

Modified:
  imagemagick/trunk/PKGBUILD
Deleted:
  imagemagick/trunk/libpng_mmx_patch_x86_64.patch

-------------------------------+
 PKGBUILD                      |   19 +++++++------------
 libpng_mmx_patch_x86_64.patch |   12 ------------
 2 files changed, 7 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-05 21:05:28 UTC (rev 122660)
+++ PKGBUILD	2011-05-05 21:34:04 UTC (rev 122661)
@@ -3,7 +3,7 @@
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.6.9.4
+pkgver=6.6.9.8
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,24 +12,18 @@
          '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 @@
           '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"
 

Deleted: libpng_mmx_patch_x86_64.patch
===================================================================
--- libpng_mmx_patch_x86_64.patch	2011-05-05 21:05:28 UTC (rev 122660)
+++ libpng_mmx_patch_x86_64.patch	2011-05-05 21:34:04 UTC (rev 122661)
@@ -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