diff options
| author |   Karol Wojtaszek <sekretarz@gentoo.org> | 2005-01-18 14:46:55 +0000 |
|---|---|---|
| committer | Karol Wojtaszek <sekretarz@gentoo.org> | 2005-01-18 14:46:55 +0000 |
| commit | 3357bf880c339e4896b7bc687d2c46567267cf02 (patch) | |
| tree | 58e91820e9d4adb3e14466ff0b68f77d5447463a /media-gfx | |
| parent | stable on x86 (diff) | |
| download | historical-3357bf880c339e4896b7bc687d2c46567267cf02.tar.gz historical-3357bf880c339e4896b7bc687d2c46567267cf02.tar.bz2 historical-3357bf880c339e4896b7bc687d2c46567267cf02.zip | |
Fixed fpx compile problems
Package-Manager: portage-2.0.51-r13
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/Manifest | 11 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-6.1.8.8-fpx.patch | 11 | ||||
| -rw-r--r-- | media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild | 9 |
4 files changed, 27 insertions, 10 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index 82c17af01b58..bde2124eae53 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/imagemagick # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.110 2005/01/17 21:41:37 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.111 2005/01/18 14:46:55 sekretarz Exp $ + + 18 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> + +files/imagemagick-6.1.8.8-fpx.patch, imagemagick-6.1.8.8.ebuild: + Fixed fpx compile problems *imagemagick-6.1.8.8 (17 Jan 2005) diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index 82bd9e80fa95..c0475999c583 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -4,12 +4,13 @@ Hash: SHA1 MD5 2138063473fc1d9a3b517e7e797a061d imagemagick-6.0.8.1.ebuild 2318 MD5 ef4af3dba983edbe00115f3e31b3e64c imagemagick-6.1.6.0.ebuild 2164 MD5 7b8474c823224fc868c8dd4630d98467 imagemagick-6.1.0.1.ebuild 2314 -MD5 ec4a88d227f6eae8a28450187ae13e94 imagemagick-6.1.8.8.ebuild 2299 +MD5 ce258256713fa20a0bafca679f903261 imagemagick-6.1.8.8.ebuild 2331 MD5 905394a2ebdbfa1a49e7ea6cb9de1180 imagemagick-6.1.3.2.ebuild 2123 MD5 51d852e32341aca08dc8108a1e34866a imagemagick-6.1.3.4.ebuild 2387 -MD5 585a230bfcb1e9368a05db3e14a1c03a ChangeLog 16878 +MD5 2b7b2b1dd471400e65e1d4017b2c8076 ChangeLog 17030 MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224 MD5 5d4260370fd22d4fa6d0a921e5036b47 imagemagick-6.0.7.1.ebuild 2311 +MD5 7f9f2aefd153cd638c79eb85bcc39b00 files/imagemagick-6.1.8.8-fpx.patch 504 MD5 220c2dac3f8b381c42fdb5e92085bdd8 files/digest-imagemagick-6.0.7.1 73 MD5 95b9bca1e2ef2b6fed9919fcc59b1462 files/digest-imagemagick-6.0.8.1 73 MD5 a4a32e0f76d7fe0b204a2d408fc52158 files/digest-imagemagick-6.1.0.1 73 @@ -21,7 +22,7 @@ MD5 edbc2be86318f2676c55ce64e47ea2f6 files/perlpatch.diff 1598 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB7DISZ/iYVBmujdURAj5lAKCXSUpaJs0rj7PlmRrNVRe7mT3EdgCgt1YP -VszEluj2KRNHX0l/O0DHiYA= -=gDFw +iD8DBQFB7SGHZ/iYVBmujdURAgaqAJ9c6eMbhSBY2716zRDSyiUpqO5bywCfb/IY +s1UJZHXZnC24wVxgGiceDTY= +=e4xb -----END PGP SIGNATURE----- diff --git a/media-gfx/imagemagick/files/imagemagick-6.1.8.8-fpx.patch b/media-gfx/imagemagick/files/imagemagick-6.1.8.8-fpx.patch new file mode 100644 index 000000000000..f33d20a5a285 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-6.1.8.8-fpx.patch @@ -0,0 +1,11 @@ +--- ImageMagick-6.1.8/coders/fpx.c.orig 2005-01-14 02:07:46.000000000 +0100 ++++ ImageMagick-6.1.8/coders/fpx.c 2005-01-18 15:34:54.452921808 +0100 +@@ -975,7 +975,7 @@ + if (p == (const PixelPacket *) NULL) + break; + if (fpx_info.numberOfComponents == 1) +- (void) ImportQuantumPixels(image,GrayQuantum,pixels); ++ (void) ImportQuantumPixels(image,GrayQuantum,0,pixels); + else + if (image->matte == MagickFalse) + (void) ImportQuantumPixels(image,RGBQuantum,0,pixels); diff --git a/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild b/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild index d7fd72f9c0e0..098ebf68f93b 100644 --- a/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v 1.3 2005/01/17 21:45:19 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.1.8.8.ebuild,v 1.4 2005/01/18 14:46:55 sekretarz Exp $ inherit libtool flag-o-matic eutils @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.imagemagick.org/pub/${MY_PN}/${MY_P2}.tar.bz2" LICENSE="as-is" SLOT="0" -# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU. +# PLEASE BUMP AND UPDATE KEYWORDS OF dev-perl/perlmagick TO MATCH THIS. THANK YOU. KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="X cups jpeg lcms mpeg png truetype tiff xml2 wmf jbig perl graphviz fpx" @@ -45,6 +45,7 @@ src_unpack() { cd ${S} chmod +x config.sub + epatch ${FILESDIR}/${P}-fpx.patch } src_compile() { @@ -78,10 +79,10 @@ src_compile() { src_install() { make DESTDIR=${D} install - # bug 69705 + #bug 69705 rm -f ${D}/usr/lib/libltdl* - # bug 73464 + #bug 73464 rm -f ${D}/usr/lib/perl5/5.8.6/x86_64-linux/perllocal.pod dosed "s:-I/usr/include ::" /usr/bin/Magick-config |