diff options
| author |   Mark Wright <gienah@gentoo.org> | 2013-09-08 04:19:39 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2013-09-08 04:19:39 +0000 |
| commit | 8992deecdf2edafc9efd4eed1d5ad3fc92b30063 (patch) | |
| tree | c17b3ed0e2e0e2019ddc7613adbad01ea29766d3 /media-libs/freeimage | |
| parent | Automated update. (diff) | |
| download | gentoo-2-8992deecdf2edafc9efd4eed1d5ad3fc92b30063.tar.gz gentoo-2-8992deecdf2edafc9efd4eed1d5ad3fc92b30063.tar.bz2 gentoo-2-8992deecdf2edafc9efd4eed1d5ad3fc92b30063.zip | |
Thanks to Christian Heimes for porting freeimage to use libjpeg-turbo, freeimage-3.15.4-libjpeg-turbo.patch.gz is from Christian's fork at https://bitbucket.org/tiran/freeimageturbo. Fixes bug 479476. Thanks to Aleksander for reporting, Samuli Suominen, SpanKY for comments on how it should be fixed.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'media-libs/freeimage')
| -rw-r--r-- | media-libs/freeimage/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz | bin | 0 -> 5391 bytes | |||
| -rw-r--r-- | media-libs/freeimage/freeimage-3.15.4.ebuild | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog index 946e47d55c22..8256b6f98e2a 100644 --- a/media-libs/freeimage/ChangeLog +++ b/media-libs/freeimage/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/freeimage # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.28 2013/06/13 12:29:48 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.29 2013/09/08 04:19:39 gienah Exp $ + + 08 Sep 2013; Mark Wright <gienah@gentoo.org> + +files/freeimage-3.15.4-libjpeg-turbo.patch.gz, freeimage-3.15.4.ebuild: + Thanks to Christian Heimes for porting freeimage to use libjpeg-turbo, + freeimage-3.15.4-libjpeg-turbo.patch.gz is from Christian's fork at + https://bitbucket.org/tiran/freeimageturbo. Fixes bug 479476. Thanks to + Aleksander for reporting, Samuli Suominen, SpanKY for comments on how it + should be fixed. 13 Jun 2013; Michael Weber <xmw@gentoo.org> freeimage-3.15.3-r2.ebuild, freeimage-3.15.3.ebuild, freeimage-3.15.4.ebuild: diff --git a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz Binary files differnew file mode 100644 index 000000000000..507235462131 --- /dev/null +++ b/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild index f5e7a017d250..1f89be01ceb1 100644 --- a/media-libs/freeimage/freeimage-3.15.4.ebuild +++ b/media-libs/freeimage/freeimage-3.15.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.4 2013/06/13 12:29:48 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.5 2013/09/08 04:19:39 gienah Exp $ EAPI="4" @@ -40,8 +40,10 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_PN} src_prepare() { + # Patch from Christian Heimes's fork (thanks) https://bitbucket.org/tiran/freeimageturbo + epatch "${FILESDIR}"/${PN}-3.15.4-libjpeg-turbo.patch.gz cd Source - cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die + cp LibJPEG/{transupp.c,transupp.h,jpegcomp.h,jpegint.h,jinclude.h} . || die cp LibTIFF4/{tiffiop,tif_dir}.h . || die rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die cd .. |