Fix jpeg image loading, bug #175467

Package-Manager: portage-2.1.2.4

5 files changed, 133 insertions, 16 deletions

diff --git a/media-libs/freeimage/ChangeLog b/media-libs/freeimage/ChangeLog
index 4d1e0fb3f0f0..f93072552b69 100644
--- a/media-libs/freeimage/ChangeLog
+++ b/media-libs/freeimage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/freeimage
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.2 2007/04/10 21:11:48 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/ChangeLog,v 1.3 2007/04/22 22:19:21 nyhm Exp $
+
+*freeimage-3.9.3-r1 (22 Apr 2007)
+
+  22 Apr 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/freeimage-3.9.3-sys-headers.patch, +freeimage-3.9.3-r1.ebuild:
+  Fix jpeg image loading, bug #175467
 
   10 Apr 2007; Peter Weller <welp@gentoo.org> freeimage-3.9.3.ebuild:
   Keyworded amd64 wrt bug 174055
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index d8b64e3bf1db..5c8300db56ca 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,21 +1,35 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freeimage-3.9.3-build.patch 4851 RMD160 9aa0f4e1db53f5079bf94088c1f0ffa98f3f221d SHA1 82488ad79d6e61af1aa90f62d3c044ee4ea835bc SHA256 f384c64a1e07ee43e1c830d1eb96f411f9df2ae964c4615d4c50877eac12876a
 MD5 b6e237c6334bb3d5a6802e6978931a2c files/freeimage-3.9.3-build.patch 4851
 RMD160 9aa0f4e1db53f5079bf94088c1f0ffa98f3f221d files/freeimage-3.9.3-build.patch 4851
 SHA256 f384c64a1e07ee43e1c830d1eb96f411f9df2ae964c4615d4c50877eac12876a files/freeimage-3.9.3-build.patch 4851
+AUX freeimage-3.9.3-sys-headers.patch 2399 RMD160 3b790286432e8d535c4e0950cc6ca2e31881bf2a SHA1 0b8f9542d88d9c47709b4840249aaf434a166055 SHA256 402349dd49decb1f2e343b3607abd6118066358ada64a33391f3abdc70e888b6
+MD5 50994bd7b8263b09799dbde15c5b49de files/freeimage-3.9.3-sys-headers.patch 2399
+RMD160 3b790286432e8d535c4e0950cc6ca2e31881bf2a files/freeimage-3.9.3-sys-headers.patch 2399
+SHA256 402349dd49decb1f2e343b3607abd6118066358ada64a33391f3abdc70e888b6 files/freeimage-3.9.3-sys-headers.patch 2399
 DIST FreeImage393.pdf 2158061 RMD160 46ed9fd6781560a17220d5f9d5128207c8d7e8d0 SHA1 29981db35b5f62ab94450af5d3093265237bac81 SHA256 a982dc7fe4d0c40e650ca55fa0b010ed13b15c0681e3831ced48f95853952395
 DIST FreeImage393.zip 2507055 RMD160 d7a33a6c9b101d39db16ee18f9177b3f590df6ab SHA1 07696e54ed246d08cf401a9e39e9256b4e73ec9a SHA256 59f6b75d778e40eff7cb4068e556c65230f9fe1af8d17ad74fec48f334a34fc0
-EBUILD freeimage-3.9.3.ebuild 1185 RMD160 fb0c495a657d774e6ca25abbc05f6deb1ca91575 SHA1 8912efa4165a08a8dc89a6dfc68f5023ca68c9fc SHA256 14e3a633dbe1d4445322bb658c6e2d58c4853f943e106f5db3cfbd4448300fba
-MD5 2545d9a6459dcbd84095a9709364a5fc freeimage-3.9.3.ebuild 1185
-RMD160 fb0c495a657d774e6ca25abbc05f6deb1ca91575 freeimage-3.9.3.ebuild 1185
-SHA256 14e3a633dbe1d4445322bb658c6e2d58c4853f943e106f5db3cfbd4448300fba freeimage-3.9.3.ebuild 1185
-MISC ChangeLog 506 RMD160 7c4190a14f7cb29953e877ca0181d74b382a66e4 SHA1 850d4e20c4534582884e5915a83e02c99ff299d9 SHA256 8ed89ee14262a6cf177b8765980e3937c2c44a802b9b5a9dee9dc9b4abefa8b7
-MD5 fecc8ea0c02d54bbacde90607ba5945f ChangeLog 506
-RMD160 7c4190a14f7cb29953e877ca0181d74b382a66e4 ChangeLog 506
-SHA256 8ed89ee14262a6cf177b8765980e3937c2c44a802b9b5a9dee9dc9b4abefa8b7 ChangeLog 506
+EBUILD freeimage-3.9.3-r1.ebuild 1281 RMD160 3ace7015a1ac73926034596df92fa1f7bce0ba0c SHA1 d843b010e395b4238f839434c0ecb8d1cb27eca9 SHA256 393d20ceba1701b153037ef30dd85f9ca7306924a360af7914049ead519b584f
+MD5 4852ca6fd0dad2281522583df79a1e96 freeimage-3.9.3-r1.ebuild 1281
+RMD160 3ace7015a1ac73926034596df92fa1f7bce0ba0c freeimage-3.9.3-r1.ebuild 1281
+SHA256 393d20ceba1701b153037ef30dd85f9ca7306924a360af7914049ead519b584f freeimage-3.9.3-r1.ebuild 1281
+MISC ChangeLog 700 RMD160 14b5c643df421fbdafab6d13d835dc07f494c060 SHA1 8d7ff0231151dd08949c511d6a1f8721525eda07 SHA256 53bfb19e58d123033e11b2fe1b9b2b7df85bd0f6a50f33c687ec36d8787ced7f
+MD5 b722e10a376f907043a90028ec882638 ChangeLog 700
+RMD160 14b5c643df421fbdafab6d13d835dc07f494c060 ChangeLog 700
+SHA256 53bfb19e58d123033e11b2fe1b9b2b7df85bd0f6a50f33c687ec36d8787ced7f ChangeLog 700
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 2a9cb3dff7debed004fcd1b08c4816cd files/digest-freeimage-3.9.3 464
-RMD160 9dd38f47bf2e10d715696e6135d24b9e5aafbdff files/digest-freeimage-3.9.3 464
-SHA256 02dd381f0f4a824f218e42e9c5fb0470436e4185f6c985b420740ca59a9c7e4a files/digest-freeimage-3.9.3 464
+MD5 521d0da27e7009d832419b1b4e034324 files/digest-freeimage-3.9.3-r1 402
+RMD160 49920841304975bcdfc1272a1499b55e77887d00 files/digest-freeimage-3.9.3-r1 402
+SHA256 8540a8e800f18456cdcb09f6bc50d0a1a6ec7a605d0fbb20758ce64546cc951e files/digest-freeimage-3.9.3-r1 402
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGK99vdz7hIScOURERAkr1AKCCJji3NnEodv0xwG3Y7vI1wm3RwQCePBz3
+nwatkkljnapx3rtAyyoAalg=
+=XPxJ
+-----END PGP SIGNATURE-----
diff --git a/media-libs/freeimage/files/digest-freeimage-3.9.3 b/media-libs/freeimage/files/digest-freeimage-3.9.3-r1
index ae5ef1a19f53..6e23e815f9c4 100644
--- a/media-libs/freeimage/files/digest-freeimage-3.9.3
+++ b/media-libs/freeimage/files/digest-freeimage-3.9.3-r1
@@ -1,4 +1,3 @@
-MD5 5a59f1d2c380da666f1cd42e082e8041 FreeImage393.pdf 2158061
 RMD160 46ed9fd6781560a17220d5f9d5128207c8d7e8d0 FreeImage393.pdf 2158061
 SHA256 a982dc7fe4d0c40e650ca55fa0b010ed13b15c0681e3831ced48f95853952395 FreeImage393.pdf 2158061
 MD5 bf3574fa4e6135cf511d5ff4bc871ec3 FreeImage393.zip 2507055
diff --git a/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch b/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch
new file mode 100644
index 000000000000..2fcdbb43ade2
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.9.3-sys-headers.patch
@@ -0,0 +1,95 @@
+--- Source/FreeImage/PluginJPEG.cpp
++++ Source/FreeImage/PluginJPEG.cpp
+@@ -35,8 +35,8 @@
+ #include <setjmp.h>

+ 

+ #include "../LibJPEG/jinclude.h"

+-#include "../LibJPEG/jpeglib.h"

+-#include "../LibJPEG/jerror.h"

++#include <jpeglib.h>

++#include <jerror.h>

+ }

+ 

+ #include "FreeImage.h"

+--- Source/FreeImage/PluginMNG.cpp
++++ Source/FreeImage/PluginMNG.cpp
+@@ -22,7 +22,7 @@
+ #include "FreeImage.h"

+ #include "Utilities.h"

+ 

+-#include "../LibMNG/libmng.h"

++#include <libmng.h>

+ 

+ // ----------------------------------------------------------

+ //   Constants + headers

+--- Source/FreeImage/PluginPNG.cpp
++++ Source/FreeImage/PluginPNG.cpp
+@@ -37,7 +37,10 @@
+ 

+ // ----------------------------------------------------------

+ 

+-#include "../LibPNG/png.h"

++#define PNG_iTXt_SUPPORTED

++#define PNG_READ_iTXt_SUPPORTED

++#define PNG_WRITE_iTXt_SUPPORTED

++#include <png.h>

+ 

+ // ----------------------------------------------------------

+ 

+--- Source/FreeImage/ZLibInterface.cpp
++++ Source/FreeImage/ZLibInterface.cpp
+@@ -19,7 +19,7 @@
+ // Use at your own risk!

+ // ==========================================================

+ 

+-#include "../ZLib/zlib.h"

++#include <zlib.h>

+ #include "../ZLib/zutil.h"

+ #include "FreeImage.h"

+ #include "Utilities.h"

+--- Source/FreeImageToolkit/JPEGTransform.cpp
++++ Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -26,8 +26,8 @@
+ #include <setjmp.h>

+ 

+ #include "../LibJPEG/jinclude.h"

+-#include "../LibJPEG/jpeglib.h"

+-#include "../LibJPEG/jerror.h"

++#include <jpeglib.h>

++#include <jerror.h>

+ #include "../LibJPEG/transupp.h"

+ }

+ 

+--- Source/LibJPEG/jinclude.h
++++ Source/LibJPEG/jinclude.h
+@@ -17,7 +17,7 @@
+ 

+ /* Include auto-config file to find out which system include files we need. */

+ 

+-#include "jconfig.h"		/* auto configuration options */

++#include <jconfig.h>

+ #define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */

+ 

+ /*

+--- Source/LibJPEG/transupp.c
++++ Source/LibJPEG/transupp.c
+@@ -18,7 +18,7 @@
+ #define JPEG_INTERNALS

+ 

+ #include "jinclude.h"

+-#include "jpeglib.h"

++#include <jpeglib.h>

+ #include "transupp.h"		/* My own external interface */

+ #include <ctype.h>		/* to declare isdigit() */

+ 

+--- Source/ZLib/zutil.h
++++ Source/ZLib/zutil.h
+@@ -14,7 +14,7 @@
+ #define ZUTIL_H

+ 

+ #define ZLIB_INTERNAL

+-#include "zlib.h"

++#include <zlib.h>

+ 

+ #ifdef STDC

+ #  ifndef _WIN32_WCE

diff --git a/media-libs/freeimage/freeimage-3.9.3.ebuild b/media-libs/freeimage/freeimage-3.9.3-r1.ebuild
index fb05bc603b3f..33b774b558f7 100644
--- a/media-libs/freeimage/freeimage-3.9.3.ebuild
+++ b/media-libs/freeimage/freeimage-3.9.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.9.3.ebuild,v 1.2 2007/04/10 21:11:48 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freeimage/freeimage-3.9.3-r1.ebuild,v 1.1 2007/04/22 22:19:21 nyhm Exp $
 
-inherit eutils toolchain-funcs multilib
+inherit eutils flag-o-matic toolchain-funcs multilib
 
 MY_PN=FreeImage
 MY_P=${MY_PN}${PV//.}
@@ -28,7 +28,9 @@ S=${WORKDIR}/${MY_PN}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.patch
+	epatch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-sys-headers.patch
 	edos2unix gensrclist.sh genfipsrclist.sh
 	sh ./gensrclist.sh || die "gensrclist failed"
 	sh ./genfipsrclist.sh || die "genfipsrclist failed"
@@ -36,6 +38,7 @@ src_unpack() {
 
 src_compile() {
 	tc-export CC CXX AR
+	append-flags -fno-strict-aliasing
 	emake || die "emake failed"
 }