rebased on ABS version. Only removed HDRI

added missing perlmagick.rpath.patch

3 files changed, 71 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59a378e7a085..5d19ad0891c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imagemagick-no-hdri
-	pkgver = 6.9.0.6
-	pkgrel = 2
+	pkgver = 6.9.7.9
+	pkgrel = 1
 	url = http://www.imagemagick.org/
 	arch = i686
 	arch = x86_64
@@ -15,32 +15,41 @@ pkgbase = imagemagick-no-hdri
 	makedepends = libwmf
 	makedepends = librsvg
 	makedepends = libxml2
-	makedepends = jasper
 	makedepends = liblqr
+	makedepends = openjpeg2
 	makedepends = opencl-headers
-	makedepends = libcl
+	makedepends = opencl-icd-loader
 	makedepends = libwebp
+	makedepends = subversion
+	makedepends = glu
 	provides = imagemagick
 	conflicts = imagemagick
-	source = http://ftp.lfs-matrix.net/pub/blfs/conglomeration/ImageMagick/ImageMagick-6.9.0-6.tar.xz
-	sha1sums = 0233275c2e35264da6c90c163c5436c928352478
+	source = http://www.imagemagick.org/download/ImageMagick-6.9.7-9.tar.xz
+	source = http://www.imagemagick.org/download/ImageMagick-6.9.7-9.tar.xz.asc
+	source = perlmagick.rpath.patch
+	validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
+	sha1sums = 3252058951b4e9eec3aef10120906336a5652672
+	sha1sums = SKIP
+	sha1sums = e143cf9d530fabf3b58023899b5cc544ba93daec
 
 pkgname = imagemagick-no-hdri
 	pkgdesc = An image viewing/manipulation program
-	depends = perl
 	depends = libltdl
 	depends = lcms2
 	depends = libxt
 	depends = fontconfig
 	depends = libxext
 	depends = liblqr
-	depends = libcl
+	depends = opencl-icd-loader
+	depends = perl>=
+	depends = perl<
+	optdepends = imagemagick-doc: for additional information
 	optdepends = ghostscript: for Ghostscript support
 	optdepends = openexr: for OpenEXR support
+	optdepends = openjpeg2: for JP2 support
 	optdepends = libwmf: for WMF support
 	optdepends = librsvg: for SVG support
 	optdepends = libxml2: for XML support
-	optdepends = jasper: for JPEG-2000 support
 	optdepends = libpng: for PNG support
 	optdepends = libwebp: for WEBP support
 	options = !docs
diff --git a/PKGBUILD b/PKGBUILD
index b025755fb300..7d96e2d35c8a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,23 @@
-# Maintainer: Jose Riha <jose1711 gmail com>
+# Maintainer: Tobias Göbel <kubax1983.at.gmail.dot.com>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Cedric Brancourt <cedric.brancourt at gmail dot com>
 
-pkgname=imagemagick-no-hdri
-pkgver=6.9.0.6
-pkgrel=2
+
+pkgname=('imagemagick-no-hdri')
+pkgver=6.9.7.9
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
 license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
-             'opencl-headers' 'libcl' 'libwebp')
-
-#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz)
-source=(http://ftp.lfs-matrix.net/pub/blfs/conglomeration/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz )
-sha1sums=('0233275c2e35264da6c90c163c5436c928352478')
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+             'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2'
+             'opencl-headers' 'opencl-icd-loader' 'libwebp' 'subversion' 'glu')
+source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
+        perlmagick.rpath.patch)
+sha1sums=('3252058951b4e9eec3aef10120906336a5652672'
+          'SKIP'
+          'e143cf9d530fabf3b58023899b5cc544ba93daec')
+validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')
 
 provides=('imagemagick')
 conflicts=('imagemagick')
@@ -23,35 +26,39 @@ 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##*.}
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
+  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
+    --with-wmf --with-openexr --with-xml \
     --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 --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw 
- make
+    --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##*.}
-  # checks realy takes a long time
-  # make check
+#  make check
 }
 
 package() {
   pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
-  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' 
-              'libpng: for PNG support' 
+  depends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'opencl-icd-loader')
+  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"
@@ -75,4 +82,13 @@ package() {
 
 #Cleaning
   rm -f "${pkgdir}"/usr/lib/*.la
+
+# template start; name=perl-binary-module-dependency; version=1;
+if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then
+	_perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')
+	_perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')
+	depends+=("perl>=$_perlver_min" "perl<$_perlver_max")
+fi
+# template end;
 }
+
diff --git a/perlmagick.rpath.patch b/perlmagick.rpath.patch
new file mode 100644
index 000000000000..a5b1a82e23d2
--- /dev/null
+++ b/perlmagick.rpath.patch
@@ -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)
++@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@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
+ 
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \