From fab493b2e4893382a91050101c622dc3cc6e81b4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 30 Jun 2014 20:39:50 -0400 Subject: Update pcr/imagemagick-srv as pcr/imagemagick-nox --- pcr/imagemagick-nox/PKGBUILD | 101 +++++++++++++++++++++++++++++ pcr/imagemagick-nox/perlmagick.rpath.patch | 11 ++++ pcr/imagemagick-srv/PKGBUILD | 84 ------------------------ pcr/imagemagick-srv/perlmagick.rpath.patch | 11 ---- 4 files changed, 112 insertions(+), 95 deletions(-) create mode 100644 pcr/imagemagick-nox/PKGBUILD create mode 100644 pcr/imagemagick-nox/perlmagick.rpath.patch delete mode 100644 pcr/imagemagick-srv/PKGBUILD delete mode 100644 pcr/imagemagick-srv/perlmagick.rpath.patch (limited to 'pcr') diff --git a/pcr/imagemagick-nox/PKGBUILD b/pcr/imagemagick-nox/PKGBUILD new file mode 100644 index 000000000..403e8d84d --- /dev/null +++ b/pcr/imagemagick-nox/PKGBUILD @@ -0,0 +1,101 @@ +# $Id: PKGBUILD 215482 2014-06-26 17:44:45Z eric $ +# Maintainer (Arch): Eric Bélanger +# Maintainer: Márcio Silva +# Contributor: Luke Shumaker + +_pkgname=imagemagick +pkgname=imagemagick-nox +pkgver=6.8.9.4 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +url="http://www.imagemagick.org/" +license=('custom') +# Remove libxt, libxext, opencl-headers, libcl +makedepends=('libltdl' 'lcms2' 'fontconfig' 'ghostscript' + 'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' + '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=('b3aa7b95f8db8a863602fa4c205420ad1d5a69b7' + 'SKIP' + 'e143cf9d530fabf3b58023899b5cc544ba93daec') + +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +replaces=("imagemagick-srv") + +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" + [[ $CARCH = "mips64el" ]] && EXTRAOPTS="--with-gcc-arch=mips64el" + + no_x=yes with_x=no \ + ./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 \ + --disable-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() { + pkgdesc="An image viewing/manipulation program" + pkgdesc+=" (without X11; for servers)" + # Remove libxt, libxext, libcl + depends=('perl' 'libltdl' 'lcms2' 'fontconfig' 'liblqr') + 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/${pkgname}/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/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" +} diff --git a/pcr/imagemagick-nox/perlmagick.rpath.patch b/pcr/imagemagick-nox/perlmagick.rpath.patch new file mode 100644 index 000000000..a5b1a82e2 --- /dev/null +++ b/pcr/imagemagick-nox/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@' && \ diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD deleted file mode 100644 index 68cd9e607..000000000 --- a/pcr/imagemagick-srv/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer (Arch): Eric Bélanger -# Maintainer: Márcio Silva - -pkgbase=imagemagick -pkgname=imagemagick-srv -pkgver=6.8.8.9 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url="http://www.imagemagick.org/" -license=('custom') -provides=("$pkgbase=$pkgver") -conflicts=($pkgbase) -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ - 'libwebp') # libcl opencl-headers -#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=('3ad2deadbc7e7c6e61eb5590fcc49d71fd96b247' - '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" - [[ $CARCH = "mips64el" ]] && EXTRAOPTS="--with-gcc-arch=mips64el" - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ - --disable-opencl --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-srv() { - pkgdesc="An image viewing/manipulation program (for web servers)" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl') - optdepends=('imagemagick-doc: for additional information' - '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' - '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 -} diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch deleted file mode 100644 index a5b1a82e2..000000000 --- a/pcr/imagemagick-srv/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 v1.2.3