Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 479476 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-11 / +14 lines)
Line  Link Here
0
-- freeimage-3.15.4.ebuild
0
++ freeimage-3.15.4.ebuild
Lines 2-10 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.4 2013/06/13 12:29:48 xmw Exp $
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.15.4.ebuild,v 1.4 2013/06/13 12:29:48 xmw Exp $
4
4
5
EAPI="4"
5
EAPI=5
6
6
7
inherit toolchain-funcs eutils multilib
7
inherit eutils multilib toolchain-funcs
8
8
9
MY_PN=FreeImage
9
MY_PN=FreeImage
10
MY_PV=${PV//.}
10
MY_PV=${PV//.}
Lines 13-19 Link Here
13
DESCRIPTION="Image library supporting many formats"
13
DESCRIPTION="Image library supporting many formats"
14
HOMEPAGE="http://freeimage.sourceforge.net/"
14
HOMEPAGE="http://freeimage.sourceforge.net/"
15
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
15
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
16
	mirror://sourceforge/${PN}/${MY_P}.pdf"
16
	mirror://sourceforge/${PN}/${MY_P}.pdf
17
	mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.0.tar.gz"
17
18
18
LICENSE="|| ( GPL-2 FIPL-1.0 )"
19
LICENSE="|| ( GPL-2 FIPL-1.0 )"
19
SLOT="0"
20
SLOT="0"
Lines 22-37 Link Here
22
23
23
# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
24
# The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
24
# uses code from it to handle 16bit<->float conversions.
25
# uses code from it to handle 16bit<->float conversions.
26
# The depend should be 'jpeg? ( virtual/jpeg:0= )', see bug #479476
25
RDEPEND="sys-libs/zlib
27
RDEPEND="sys-libs/zlib
26
	jpeg? ( virtual/jpeg )
28
	jpeg? ( >=media-libs/libjpeg-turbo-1.3.0-r2 )
27
	jpeg2k? ( media-libs/openjpeg:0 )
29
	jpeg2k? ( media-libs/openjpeg:0= )
28
	mng? ( media-libs/libmng )
30
	mng? ( media-libs/libmng )
29
	openexr? ( media-libs/openexr )
31
	openexr? ( media-libs/openexr:= )
30
	png? ( media-libs/libpng )
32
	png? ( media-libs/libpng:0= )
31
	raw? ( media-libs/libraw )
33
	raw? ( media-libs/libraw )
32
	tiff? (
34
	tiff? (
33
		media-libs/ilmbase
35
		media-libs/ilmbase:=
34
		media-libs/tiff
36
		media-libs/tiff:=
35
	)"
37
	)"
36
DEPEND="${RDEPEND}
38
DEPEND="${RDEPEND}
37
	virtual/pkgconfig
39
	virtual/pkgconfig
Lines 41-47 Link Here
41
43
42
src_prepare() {
44
src_prepare() {
43
	cd Source
45
	cd Source
44
	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
46
	cp "${WORKDIR}"/libjpeg-turbo-1.3.0/{transupp.c,transupp.h,jpegcomp.h,jinclude.h} . || die
47
#	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
45
	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
48
	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
46
	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
49
	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG || die
47
	cd ..
50
	cd ..

Return to bug 479476