[patch] Make the package build against >= libjpeg-turbo-1.3.0-r2

foo.patch (text/plain), 2.13 KB, created by Samuli Suominen (RETIRED) on 2013-08-02 15:13:59 UTC

transupp.{h,c} are internal files shipped with every libjpeg implementation package
their API changed incompatible to .so.62 after release of IJG JPEG 7 or newer

Note that this doesn't fix building with >=media-libs/jpeg-9 which fails differently. Propably best to force
libjpeg-turbo which is the default anyway, for now.

--- freeimage-3.15.4.ebuild
+++ freeimage-3.15.4.ebuild
@@ -2,9 +2,9 @@
 # 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 $
 
-EAPI="4"
+EAPI=5
 
-inherit toolchain-funcs eutils multilib
+inherit eutils multilib toolchain-funcs
 
 MY_PN=FreeImage
 MY_PV=${PV//.}
@@ -13,7 +13,8 @@
 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
+	mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.0.tar.gz"
 
 LICENSE="|| ( GPL-2 FIPL-1.0 )"
 SLOT="0"
@@ -22,16 +23,17 @@
 
 # The tiff/ilmbase isn't a typo.  The TIFF plugin cheats and
 # uses code from it to handle 16bit<->float conversions.
+# The depend should be 'jpeg? ( virtual/jpeg:0= )', see bug #479476
 RDEPEND="sys-libs/zlib
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg:0 )
+	jpeg? ( >=media-libs/libjpeg-turbo-1.3.0-r2 )
+	jpeg2k? ( media-libs/openjpeg:0= )
 	mng? ( media-libs/libmng )
-	openexr? ( media-libs/openexr )
-	png? ( media-libs/libpng )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
 	raw? ( media-libs/libraw )
 	tiff? (
-		media-libs/ilmbase
-		media-libs/tiff
+		media-libs/ilmbase:=
+		media-libs/tiff:=
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -41,7 +43,8 @@
 
 src_prepare() {
 	cd Source
-	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp "${WORKDIR}"/libjpeg-turbo-1.3.0/{transupp.c,transupp.h,jpegcomp.h,jinclude.h} . || die
+#	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 ..