From fec374317980ecfa8b6982b8d9980fdccdb4ed76 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 28 Feb 2018 20:31:51 +0000 Subject: imagemagick: update to 7.0.7.24 --- abs/core/imagemagick/PKGBUILD | 189 ++++++++++++++++++---------- abs/core/imagemagick/arch-fonts.diff | 107 ++++++++++++++++ abs/core/imagemagick/perlmagick.rpath.patch | 11 -- 3 files changed, 227 insertions(+), 80 deletions(-) create mode 100644 abs/core/imagemagick/arch-fonts.diff delete mode 100644 abs/core/imagemagick/perlmagick.rpath.patch diff --git a/abs/core/imagemagick/PKGBUILD b/abs/core/imagemagick/PKGBUILD index 4080a3b..228f1fc 100644 --- a/abs/core/imagemagick/PKGBUILD +++ b/abs/core/imagemagick/PKGBUILD @@ -2,89 +2,140 @@ # Maintainer: Eric Bélanger pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.9.0.0 +pkgname=(libmagick imagemagick imagemagick-doc) +pkgver=7.0.7.24 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') +pkgdesc="An image viewing/manipulation program" +url="https://www.imagemagick.org/" +arch=(x86_64) +license=(custom) +depends=(libltdl lcms2 fontconfig libxext liblqr libraqm libpng) +makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp + chrpath ocl-icd glu ghostpcl ghostxps) +checkdepends=(gsfonts ttf-dejavu) +_relname=ImageMagick-${pkgver%%.*} +_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.} +source=(https://www.imagemagick.org/download/$_tarname.tar.xz{,.asc} + arch-fonts.diff) +sha256sums=('2f83f8a1b7725e9d96a6f4ddf8dd2e70d44bc039bdc32f056805ab4d0f7485fb' + 'SKIP' + 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73') +validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae + +shopt -s extglob prepare() { - cd ImageMagick-${pkgver%.*}-${pkgver##*.} - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --force --install - patch -p0 -i "${srcdir}/perlmagick.rpath.patch" + mkdir -p binpkg/usr/lib/pkgconfig {binpkg,docpkg}/usr/share + + cd $_tarname + + # Fix up typemaps to match our packages, where possible + patch -Np1 -i ../arch-fonts.diff + + # Don't run auto(re)conf; assumes use of git } 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 + cd $_tarname + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-dejavu-font-dir=/usr/share/fonts/TTF \ + --with-gs-font-dir=/usr/share/fonts/gsfonts \ + PSDelegate=/usr/bin/gs \ + XPSDelegate=/usr/bin/gxps \ + PCLDelegate=/usr/bin/gpcl6 \ + --enable-hdri \ + --enable-opencl \ + --with-gslib \ + --with-lqr \ + --with-modules \ + --with-openexr \ + --with-openjp2 \ + --with-perl \ + --with-perl-options=INSTALLDIRS=vendor \ + --with-rsvg \ + --with-webp \ + --with-wmf \ + --with-xml \ + --without-autotrace \ + --without-djvu \ + --without-dps \ + --without-fftw \ + --without-fpx \ + --without-gcc-arch \ + --without-gvc \ + --without-jbig + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } -check() { - cd ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check +check() ( + cd $_tarname + ulimit -n 4096 + make check +) + +package_libmagick() { + pkgdesc+=" (library)" + optdepends=('ghostscript: PS/PDF support' + 'libraw: DNG support' + 'librsvg: SVG support' + 'libwebp: WEBP support' + 'libwmf: WMF support' + 'libxml2: Magick Scripting Language' + 'ocl-icd: OpenCL support' + 'openexr: OpenEXR support' + 'openjpeg2: JPEG2000 support' + 'pango: Text rendering') + backup=(etc/$_relname/{coder,colors,delegates,log,magic,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml) + options=('!emptydirs' libtool) + + cd $_tarname + make DESTDIR="$pkgdir" install + + rm "$pkgdir"/etc/$_relname/type-{apple,urw-base35,windows}.xml + rm "$pkgdir"/usr/lib/*.la + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE + +# Split 'imagemagick' + cd ../binpkg + mv "$pkgdir/usr/bin" usr/ + mv "$pkgdir/usr/lib/perl5" usr/lib/ + mv "$pkgdir/usr/share/man" usr/share/ + +# Split docs + mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/" } 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 + depends=("libmagick=$pkgver-$pkgrel") + optdepends=('imagemagick-doc: manual and API docs') + options=('!emptydirs') + + mv binpkg/* "$pkgdir" + + find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} + + +# 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; + + cd $_tarname + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE } package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" + pkgdesc+=" (manual and API docs)" + depends=() + + mv docpkg/* "$pkgdir" - 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" + cd $_tarname + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE } diff --git a/abs/core/imagemagick/arch-fonts.diff b/abs/core/imagemagick/arch-fonts.diff new file mode 100644 index 0000000..63a547c --- /dev/null +++ b/abs/core/imagemagick/arch-fonts.diff @@ -0,0 +1,107 @@ +diff -u -r ImageMagick-6.9.9-25/config/type-dejavu.xml.in ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in +--- ImageMagick-6.9.9-25/config/type-dejavu.xml.in 2017-11-30 19:24:05.000000000 +0100 ++++ ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in 2017-12-02 18:44:53.410304554 +0100 +@@ -13,27 +13,6 @@ + ImageMagick DejaVU font configuration. + --> + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +diff -u -r ImageMagick-6.9.9-25/config/type-ghostscript.xml.in ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in +--- ImageMagick-6.9.9-25/config/type-ghostscript.xml.in 2017-11-30 19:24:05.000000000 +0100 ++++ ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in 2017-12-02 19:08:05.669243822 +0100 +@@ -13,38 +13,38 @@ + ImageMagick Ghostscript font configuration. + --> + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + diff --git a/abs/core/imagemagick/perlmagick.rpath.patch b/abs/core/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index a5b1a82..0000000 --- a/abs/core/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -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) -+@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@' && \ -- cgit v0.12