[arch-commits] Commit in imagemagick/repos (12 files)

Eric Bélanger eric at archlinux.org
Wed Dec 31 19:42:47 UTC 2014


    Date: Wednesday, December 31, 2014 @ 20:42:47
  Author: eric
Revision: 228251

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  imagemagick/repos/extra-i686/PKGBUILD
    (from rev 228248, imagemagick/trunk/PKGBUILD)
  imagemagick/repos/extra-i686/imagemagick-palm.diff
    (from rev 228248, imagemagick/trunk/imagemagick-palm.diff)
  imagemagick/repos/extra-i686/imagemagick-rle.diff
    (from rev 228248, imagemagick/trunk/imagemagick-rle.diff)
  imagemagick/repos/extra-i686/perlmagick.rpath.patch
    (from rev 228248, imagemagick/trunk/perlmagick.rpath.patch)
  imagemagick/repos/extra-x86_64/PKGBUILD
    (from rev 228249, imagemagick/trunk/PKGBUILD)
  imagemagick/repos/extra-x86_64/imagemagick-palm.diff
    (from rev 228249, imagemagick/trunk/imagemagick-palm.diff)
  imagemagick/repos/extra-x86_64/imagemagick-rle.diff
    (from rev 228249, imagemagick/trunk/imagemagick-rle.diff)
  imagemagick/repos/extra-x86_64/perlmagick.rpath.patch
    (from rev 228249, imagemagick/trunk/perlmagick.rpath.patch)
Deleted:
  imagemagick/repos/extra-i686/PKGBUILD
  imagemagick/repos/extra-i686/perlmagick.rpath.patch
  imagemagick/repos/extra-x86_64/PKGBUILD
  imagemagick/repos/extra-x86_64/perlmagick.rpath.patch

-------------------------------------+
 /PKGBUILD                           |  190 ++++++++++++++++++++++++++++++++++
 /perlmagick.rpath.patch             |   22 +++
 extra-i686/PKGBUILD                 |   90 ----------------
 extra-i686/imagemagick-palm.diff    |   11 +
 extra-i686/imagemagick-rle.diff     |   18 +++
 extra-i686/perlmagick.rpath.patch   |   11 -
 extra-x86_64/PKGBUILD               |   90 ----------------
 extra-x86_64/imagemagick-palm.diff  |   11 +
 extra-x86_64/imagemagick-rle.diff   |   18 +++
 extra-x86_64/perlmagick.rpath.patch |   11 -
 10 files changed, 270 insertions(+), 202 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-12-31 19:42:46 UTC (rev 228250)
+++ extra-i686/PKGBUILD	2014-12-31 19:42:47 UTC (rev 228251)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.9.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
-             'opencl-headers' 'libcl' 'libwebp' 'subversion')
-#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch)
-sha1sums=('6bf4263ceaeea61e00fe15a95db320d49bcc48c4'
-          'SKIP'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec')
-
-prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
-}
-
-build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
-  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
-    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --enable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
-  make
-}
-
-check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
-  optdepends=('imagemagick-doc: for additional information'
-              'ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-	      'openjpeg2: for JP2 support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'libpng: for PNG support' 
-	      'libwebp: for WEBP support')
-  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-          "etc/ImageMagick-${pkgver%%.*}/log.xml"
-          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-  options=('!docs' 'libtool' '!emptydirs')
-
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}

Copied: imagemagick/repos/extra-i686/PKGBUILD (from rev 228248, imagemagick/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=imagemagick
+pkgname=('imagemagick' 'imagemagick-doc')
+pkgver=6.9.0.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.imagemagick.org/"
+license=('custom')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
+             'opencl-headers' 'libcl' 'libwebp' 'subversion')
+#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
+        perlmagick.rpath.patch imagemagick-palm.diff imagemagick-rle.diff)
+sha1sums=('da0ad71290bf92a848ceddbbcf67d765542febd5'
+          'SKIP'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec'
+	  '34f4e402963e83f5c6e6da79d75d1f43afdbca86'
+	  '75534ddcb9f787ee270bdeb0899983fc95eb33a5')
+validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
+
+prepare() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf --force --install
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+  patch -p3 -i "${srcdir}/imagemagick-palm.diff"
+  patch -p3 -i "${srcdir}/imagemagick-rle.diff"
+}
+
+build() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
+  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
+    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
+    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
+    --enable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
+    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
+  make
+}
+
+check() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+#  make check
+}
+
+package_imagemagick() {
+  pkgdesc="An image viewing/manipulation program"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
+  optdepends=('imagemagick-doc: for additional information'
+              'ghostscript: for Ghostscript support' 
+              'openexr: for OpenEXR support' 
+	      'openjpeg2: for JP2 support' 
+              'libwmf: for WMF support' 
+              'librsvg: for SVG support' 
+              'libxml2: for XML support' 
+              'libpng: for PNG support' 
+	      'libwebp: for WEBP support')
+  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+          "etc/ImageMagick-${pkgver%%.*}/log.xml"
+          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
+  options=('!docs' 'libtool' '!emptydirs')
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make -j1 DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
+
+package_imagemagick-doc() {
+  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install-data-html
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}

Copied: imagemagick/repos/extra-i686/imagemagick-palm.diff (from rev 228248, imagemagick/trunk/imagemagick-palm.diff)
===================================================================
--- extra-i686/imagemagick-palm.diff	                        (rev 0)
+++ extra-i686/imagemagick-palm.diff	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,11 @@
+Index: ImageMagick/branches/ImageMagick-6/coders/palm.c
+===================================================================
+--- ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17434)
++++ ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17515)
+@@ -511,5 +511,5 @@
+         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
+         if (bits_per_pixel != 16)
+-          SetMagickPixelPacket(image,image->colormap+index,
++          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
+             (const IndexPacket *) NULL,&transpix);
+         (void) TransparentPaintImage(image,&transpix,(Quantum)

Copied: imagemagick/repos/extra-i686/imagemagick-rle.diff (from rev 228248, imagemagick/trunk/imagemagick-rle.diff)
===================================================================
--- extra-i686/imagemagick-rle.diff	                        (rev 0)
+++ extra-i686/imagemagick-rle.diff	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,18 @@
+Index: ImageMagick/branches/ImageMagick-6/coders/rle.c
+===================================================================
+--- ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17434)
++++ ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17516)
+@@ -457,5 +457,5 @@
+                 MagickFalse)
+               break;
+-            *p=colormap[index];
++            *p=colormap[(ssize_t) index];
+             p++;
+           }
+@@ -468,5 +468,5 @@
+                     (*p & mask)),&index,exception) == MagickFalse)
+                   break;
+-                *p=colormap[index];
++                *p=colormap[(ssize_t) index];
+                 p++;
+               }

Deleted: extra-i686/perlmagick.rpath.patch
===================================================================
--- extra-i686/perlmagick.rpath.patch	2014-12-31 19:42:46 UTC (rev 228250)
+++ extra-i686/perlmagick.rpath.patch	2014-12-31 19:42:47 UTC (rev 228251)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \

Copied: imagemagick/repos/extra-i686/perlmagick.rpath.patch (from rev 228248, imagemagick/trunk/perlmagick.rpath.patch)
===================================================================
--- extra-i686/perlmagick.rpath.patch	                        (rev 0)
+++ extra-i686/perlmagick.rpath.patch	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-12-31 19:42:46 UTC (rev 228250)
+++ extra-x86_64/PKGBUILD	2014-12-31 19:42:47 UTC (rev 228251)
@@ -1,90 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.9.0.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
-             'opencl-headers' 'libcl' 'libwebp' 'subversion')
-#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
-        perlmagick.rpath.patch)
-sha1sums=('6bf4263ceaeea61e00fe15a95db320d49bcc48c4'
-          'SKIP'
-          'e143cf9d530fabf3b58023899b5cc544ba93daec')
-
-prepare() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
-}
-
-build() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
-  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
-    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
-    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --enable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
-  make
-}
-
-check() {
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
-  optdepends=('imagemagick-doc: for additional information'
-              'ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-	      'openjpeg2: for JP2 support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'libpng: for PNG support' 
-	      'libwebp: for WEBP support')
-  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
-          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
-          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
-          "etc/ImageMagick-${pkgver%%.*}/log.xml"
-          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
-          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
-          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
-          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
-          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
-          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
-  options=('!docs' 'libtool' '!emptydirs')
-
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-
-  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}

Copied: imagemagick/repos/extra-x86_64/PKGBUILD (from rev 228249, imagemagick/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=imagemagick
+pkgname=('imagemagick' 'imagemagick-doc')
+pkgver=6.9.0.2
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://www.imagemagick.org/"
+license=('custom')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
+             'opencl-headers' 'libcl' 'libwebp' 'subversion')
+#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
+        perlmagick.rpath.patch imagemagick-palm.diff imagemagick-rle.diff)
+sha1sums=('da0ad71290bf92a848ceddbbcf67d765542febd5'
+          'SKIP'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec'
+	  '34f4e402963e83f5c6e6da79d75d1f43afdbca86'
+	  '75534ddcb9f787ee270bdeb0899983fc95eb33a5')
+validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
+
+prepare() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  sed '/AC_PATH_XTRA/d' -i configure.ac
+  autoreconf --force --install
+  patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+  patch -p3 -i "${srcdir}/imagemagick-palm.diff"
+  patch -p3 -i "${srcdir}/imagemagick-rle.diff"
+}
+
+build() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
+  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
+    --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
+    --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+    --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
+    --enable-opencl --with-openjp2 --without-gvc --without-djvu --without-autotrace \
+    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
+  make
+}
+
+check() {
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+#  make check
+}
+
+package_imagemagick() {
+  pkgdesc="An image viewing/manipulation program"
+  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
+  optdepends=('imagemagick-doc: for additional information'
+              'ghostscript: for Ghostscript support' 
+              'openexr: for OpenEXR support' 
+	      'openjpeg2: for JP2 support' 
+              'libwmf: for WMF support' 
+              'librsvg: for SVG support' 
+              'libxml2: for XML support' 
+              'libpng: for PNG support' 
+	      'libwebp: for WEBP support')
+  backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+          "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+          "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+          "etc/ImageMagick-${pkgver%%.*}/log.xml"
+          "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+          "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+          "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+          "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+          "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+          "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
+  options=('!docs' 'libtool' '!emptydirs')
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make -j1 DESTDIR="${pkgdir}" install
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+  rm -f "${pkgdir}"/usr/lib/*.la
+}
+
+package_imagemagick-doc() {
+  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
+
+  cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+  make DESTDIR="${pkgdir}" install-data-html
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
+  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
+}

Copied: imagemagick/repos/extra-x86_64/imagemagick-palm.diff (from rev 228249, imagemagick/trunk/imagemagick-palm.diff)
===================================================================
--- extra-x86_64/imagemagick-palm.diff	                        (rev 0)
+++ extra-x86_64/imagemagick-palm.diff	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,11 @@
+Index: ImageMagick/branches/ImageMagick-6/coders/palm.c
+===================================================================
+--- ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17434)
++++ ImageMagick/branches/ImageMagick-6/coders/palm.c	(revision 17515)
+@@ -511,5 +511,5 @@
+         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
+         if (bits_per_pixel != 16)
+-          SetMagickPixelPacket(image,image->colormap+index,
++          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
+             (const IndexPacket *) NULL,&transpix);
+         (void) TransparentPaintImage(image,&transpix,(Quantum)

Copied: imagemagick/repos/extra-x86_64/imagemagick-rle.diff (from rev 228249, imagemagick/trunk/imagemagick-rle.diff)
===================================================================
--- extra-x86_64/imagemagick-rle.diff	                        (rev 0)
+++ extra-x86_64/imagemagick-rle.diff	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,18 @@
+Index: ImageMagick/branches/ImageMagick-6/coders/rle.c
+===================================================================
+--- ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17434)
++++ ImageMagick/branches/ImageMagick-6/coders/rle.c	(revision 17516)
+@@ -457,5 +457,5 @@
+                 MagickFalse)
+               break;
+-            *p=colormap[index];
++            *p=colormap[(ssize_t) index];
+             p++;
+           }
+@@ -468,5 +468,5 @@
+                     (*p & mask)),&index,exception) == MagickFalse)
+                   break;
+-                *p=colormap[index];
++                *p=colormap[(ssize_t) index];
+                 p++;
+               }

Deleted: extra-x86_64/perlmagick.rpath.patch
===================================================================
--- extra-x86_64/perlmagick.rpath.patch	2014-12-31 19:42:46 UTC (rev 228250)
+++ extra-x86_64/perlmagick.rpath.patch	2014-12-31 19:42:47 UTC (rev 228251)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \

Copied: imagemagick/repos/extra-x86_64/perlmagick.rpath.patch (from rev 228249, imagemagick/trunk/perlmagick.rpath.patch)
===================================================================
--- extra-x86_64/perlmagick.rpath.patch	                        (rev 0)
+++ extra-x86_64/perlmagick.rpath.patch	2014-12-31 19:42:47 UTC (rev 228251)
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in	2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++ at WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \



More information about the arch-commits mailing list