diff options
| author |   Mark Wright <gienah@gentoo.org> | 2013-09-08 05:09:39 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2013-09-08 05:09:39 +0000 |
| commit | e9246e3fc424702d3040da1b46db8990a898e225 (patch) | |
| tree | 579e499f77a34c027b663e0aa7109f27241e9047 /media-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-e9246e3fc424702d3040da1b46db8990a898e225.tar.gz gentoo-2-e9246e3fc424702d3040da1b46db8990a898e225.tar.bz2 gentoo-2-e9246e3fc424702d3040da1b46db8990a898e225.zip | |
The fix for libjpeg-turbo is only applied when libjpeg-turbo is installed.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/freeimage/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz | bin | 5391 -> 5386 bytes | |||
| -rw-r--r-- | media-libs/freeimage/freeimage-3.15.4.ebuild | 11 |
3 files changed, 12 insertions, 5 deletions
diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog index 8256b6f98e2a..39a0d5ce29e3 100644 --- a/media-libs/freeimage/ChangeLog +++ b/media-libs/freeimage/ChangeLog @@ -1,6 +1,10 @@ # 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.29 2013/09/08 04:19:39 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.30 2013/09/08 05:09: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: + The fix for libjpeg-turbo is only applied when libjpeg-turbo is installed. 08 Sep 2013; Mark Wright <gienah@gentoo.org> +files/freeimage-3.15.4-libjpeg-turbo.patch.gz, 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 differindex 507235462131..d8daf3b11d79 100644 --- 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 diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild index 1f89be01ceb1..0e6d5a594312 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.5 2013/09/08 04:19:39 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.6 2013/09/08 05:09:39 gienah Exp $ EAPI="4" @@ -40,10 +40,13 @@ 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,jpegcomp.h,jpegint.h,jinclude.h} . || die + if has_version ">=media-libs/libjpeg-turbo-1.2.1"; then + # Patch from Christian Heimes's fork (thanks) https://bitbucket.org/tiran/freeimageturbo + epatch "${FILESDIR}"/${PN}-3.15.4-libjpeg-turbo.patch.gz + cp LibJPEG/{jpegcomp.h,jpegint.h} . || die + fi + cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die cp LibTIFF4/{tiffiop,tif_dir}.h . || die rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die cd .. |