diff options
| author |   Mark Wright <gienah@gentoo.org> | 2013-09-08 06:34:14 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2013-09-08 06:34:14 +0000 |
| commit | c20ed0986a8fcf53204288f9465b3ee9480c4fb7 (patch) | |
| tree | 3d3c8d0374bb05d4c27eb3f4cd335474f75b2ef7 /media-libs/freeimage | |
| parent | The fix for libjpeg-turbo is only applied when libjpeg-turbo is installed. (diff) | |
| download | gentoo-2-c20ed0986a8fcf53204288f9465b3ee9480c4fb7.tar.gz gentoo-2-c20ed0986a8fcf53204288f9465b3ee9480c4fb7.tar.bz2 gentoo-2-c20ed0986a8fcf53204288f9465b3ee9480c4fb7.zip | |
Thanks to radhermit for advising I need to move the patch to dev.gentoo.org/~
(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 | 6 | ||||
| -rw-r--r-- | media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz | bin | 5386 -> 0 bytes | |||
| -rw-r--r-- | media-libs/freeimage/freeimage-3.15.4.ebuild | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog index 39a0d5ce29e3..188b8ad8d6be 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.30 2013/09/08 05:09:39 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.31 2013/09/08 06:34:14 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 radhermit for advising I need to move the patch to dev.gentoo.org/~ 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 differdeleted file mode 100644 index d8daf3b11d79..000000000000 --- a/media-libs/freeimage/files/freeimage-3.15.4-libjpeg-turbo.patch.gz +++ /dev/null diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild index 0e6d5a594312..9fb18b604074 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.6 2013/09/08 05:09:39 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.7 2013/09/08 06:34:14 gienah Exp $ EAPI="4" @@ -13,7 +13,8 @@ MY_P=${MY_PN}${MY_PV} DESCRIPTION="Image library supporting many formats" HOMEPAGE="http://freeimage.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - mirror://sourceforge/${PN}/${MY_P}.pdf" + mirror://sourceforge/${PN}/${MY_P}.pdf + http://dev.gentoo.org/~gienah/2big4tree/media-libs/freeimage/${PN}-3.15.4-libjpeg-turbo.patch.gz" LICENSE="|| ( GPL-2 FIPL-1.0 )" SLOT="0" @@ -43,7 +44,7 @@ src_prepare() { cd Source 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 + epatch "${DISTDIR}"/${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 |