From cae7b71196612d90c08c39ba2bdc8d0d974aa412 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sun, 17 Jan 2010 11:59:51 +0100 Subject: mass updates/adds Signed-off-by: Florian Pritz --- imagemagick-nox/ChangeLog | 142 +++++++++++++++++++++ imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part | 0 imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part | 0 imagemagick-nox/PKGBUILD | 54 ++++++++ imagemagick-nox/add_delegate.patch | 8 ++ imagemagick-nox/libpng_mmx_patch_x86_64.patch | 12 ++ imagemagick-nox/perlmagick.rpath.patch | 10 ++ 7 files changed, 226 insertions(+) create mode 100644 imagemagick-nox/ChangeLog create mode 100644 imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part create mode 100644 imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part create mode 100644 imagemagick-nox/PKGBUILD create mode 100644 imagemagick-nox/add_delegate.patch create mode 100644 imagemagick-nox/libpng_mmx_patch_x86_64.patch create mode 100644 imagemagick-nox/perlmagick.rpath.patch (limited to 'imagemagick-nox') diff --git a/imagemagick-nox/ChangeLog b/imagemagick-nox/ChangeLog new file mode 100644 index 0000000..f35cadc --- /dev/null +++ b/imagemagick-nox/ChangeLog @@ -0,0 +1,142 @@ +2009-08-05 Eric Belanger + + * imagemagick 6.5.4.8-1 + * Upstream update + +2009-07-23 Eric Belanger + + * imagemagick 6.5.4.5-1 + * Upstream update + +2009-06-05 Eric Belanger + + * imagemagick 6.5.3.2-1 + * Upstream update + * Removed insecure RPATH (close FS#14843) + +2009-05-21 Eric Belanger + + * imagemagick 6.5.2.7-1 + * Upstream update + +2009-04-29 Eric Belanger + + * imagemagick 6.5.1.9-1 + * Upstream update + +2009-03-31 Eric Belanger + + * imagemagick 6.5.0.10-1 + * Upstream update + +2009-03-17 Eric Belanger + + * imagemagick 6.5.0.1-1 + * Upstream update + +2009-02-27 Eric Belanger + + * imagemagick 6.4.9.7-1 + * Upstream update + +2009-02-07 Eric Belanger + + * imagemagick 6.4.9.2-1 + * Upstream update + +2009-01-30 Eric Belanger + + * imagemagick 6.4.8.10-1 + * Upstream update + +2008-12-29 Eric Belanger + + * imagemagick 6.4.8.2-1 + * Upstream update + +2008-12-14 Eric Belanger + + * imagemagick 6.4.7.8-1 + * Upstream update + +2008-12-05 Eric Belanger + + * imagemagick 6.4.7.0-1 + * Upstream update + * Rebuild against heimdal 1.2.1 + +2008-11-25 Eric Belanger + + * imagemagick 6.4.6.3-1 + * Upstream update + +2008-11-14 Eric Belanger + + * imagemagick 6.4.5.6-1 + * Upstream update + +2008-10-26 Eric Belanger + + * imagemagick 6.4.5.0-1 + * Upstream update + +2008-10-18 Eric Belanger + + * imagemagick 6.4.4.9-1 + * Upstream update + +2008-10-03 Eric Belanger + + * imagemagick 6.4.4.1-1 + * Upstream update + +2008-09-06 Eric Belanger + + * imagemagick 6.4.3.6-1 + * Upstream update + * Added JPEG2000 support (close FS#10544) + +2008-08-19 Eric Belanger + + * imagemagick 6.4.2.10-1 + * Upstream update + +2008-08-11 Eric Belanger + + * imagemagick 6.4.2.7-1 + * Upstream update + * Added bzip2 and libxml2 depends + * Disabled docs + +2008-07-18 Eric Belanger + + * imagemagick 6.4.2.4-1 + * Upstream update + +2008-06-23 Eric Belanger + + * imagemagick 6.4.2.1-1 + * Upstream update + * Fixed linking problem (close FS#10574) + +2008-05-19 Eric Belanger + + * imagemagick 6.4.1.3-1 + * Upstream update + +2008-04-30 Eric Belanger + + * imagemagick 6.4.1.0-1 + * Upstream update + +2008-04-24 Eric Belanger + + * imagemagick 6.4.0.9-1 + * Upstream update + +2008-03-29 Eric Belanger + + * imagemagick 6.4.0.2-1 + * Upstream update + * Added dvips to delegates list for dvi support (close FS#8914) + * Added ChangeLog diff --git a/imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part b/imagemagick-nox/ImageMagick-6.5.6-1.tar.bz2.part new file mode 100644 index 0000000..e69de29 diff --git a/imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part b/imagemagick-nox/ImageMagick-6.5.6.1-1.tar.bz2.part new file mode 100644 index 0000000..e69de29 diff --git a/imagemagick-nox/PKGBUILD b/imagemagick-nox/PKGBUILD new file mode 100644 index 0000000..ac59e11 --- /dev/null +++ b/imagemagick-nox/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Eric Belanger + +# NOTE: To circumvent linking problems (FS#10574), this package must now be built the following way: +# install old package, build new package, install new package, rebuild +# Just uninstalling ImageMagick before build fails as it is used during the build processs + +pkgname=imagemagick-nox +pkgver=6.5.7.10 +pkgrel=1 +pkgdesc="An image viewing/manipulation program, without X dependencies" +arch=('i686' 'x86_64') +url="http://www.imagemagick.org/" +license=('custom') +depends=('lcms>=1.18-2' 'gcc-libs' 'openexr>=1.6.1' 'libtool>=2.2' 'heimdal>=1.2.1' 'bzip2' 'libxml2') +provides=('imagemagick') +options=('!makeflags' '!docs') +source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.bz2 \ + libpng_mmx_patch_x86_64.patch add_delegate.patch perlmagick.rpath.patch) +md5sums=('5f2d4d0eacbeea48af5c4cfb37c4afe2' '069980fc2590c02aed86420996259302'\ + '7f5851c4450b73d52df55c7e806cc316' 'ff9974decbfe9846f8e347239d87e4eb') +sha1sums=('f3d802f2ba01f63c60847341149021a93967979c' 'e42f3acbe85b6098af75c5cecc9a254baaa0482c'\ + '19b40dcbc5bf8efb8ce7190fed17e2921de32ea5' '23405f80904b1de94ebd7bd6fe2a332471b8c283') + +build() { + cd "${srcdir}/ImageMagick-${pkgver%.*}-${pkgver##*.}" + + if [ "${CARCH}" = "x86_64" ]; then + patch -Np1 < ../libpng_mmx_patch_x86_64.patch || return 1 + fi + + patch -p0 < ../add_delegate.patch || return 1 + patch -p0 < ../perlmagick.rpath.patch || return 1 + sed -i "s/with_autotrace='no'/with_autotrace='yes'/" configure || return 1 + + # When there is a soname bump, remove 'LIBS=-lMagickWand' from configure line and build/install. Then, readd 'LIBS=-lMagickWand' and build/install twice. + LIBS=-lMagickWand ./configure --prefix=/usr --without-modules --disable-static --enable-openmp \ + --without-x --without-wmf --with-openexr --with-xml \ + --without-gslib --with-perl --with-perl-options="INSTALLDIRS=vendor" \ + --without-gvc --without-djvu --without-autotrace --with-jp2 \ + --without-jbig --without-fpx --without-dps || return 1 + + make || return 1 + make DESTDIR="${pkgdir}" install || return 1 + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 + install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" || return 1 + + #Cleaning + find ${pkgdir} -name '*.bs' -exec rm {} \; || return 1 + find ${pkgdir} -name '.packlist' -exec rm {} \; || return 1 + find ${pkgdir} -name 'perllocal.pod' -exec rm {} \; || return 1 + + rm -f ${pkgdir}/usr/lib/*.la || return 1 +} diff --git a/imagemagick-nox/add_delegate.patch b/imagemagick-nox/add_delegate.patch new file mode 100644 index 0000000..6ba6009 --- /dev/null +++ b/imagemagick-nox/add_delegate.patch @@ -0,0 +1,8 @@ +--- config/delegates.xml.in.orig 2008-03-29 23:25:03.000000000 -0400 ++++ config/delegates.xml.in 2008-03-29 23:27:35.000000000 -0400 +@@ -103,4 +103,5 @@ + + + ++ + diff --git a/imagemagick-nox/libpng_mmx_patch_x86_64.patch b/imagemagick-nox/libpng_mmx_patch_x86_64.patch new file mode 100644 index 0000000..d86449a --- /dev/null +++ b/imagemagick-nox/libpng_mmx_patch_x86_64.patch @@ -0,0 +1,12 @@ +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 diff --git a/imagemagick-nox/perlmagick.rpath.patch b/imagemagick-nox/perlmagick.rpath.patch new file mode 100644 index 0000000..958c0f2 --- /dev/null +++ b/imagemagick-nox/perlmagick.rpath.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 ++++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 +@@ -10067,6 +10067,7 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(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@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install -- cgit v1.2.3-24-g4f1b