Fix jpeg image loading, bug #175467

(Portage version: 2.1.2.4)

4 files changed, 108 insertions, 5 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/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"
 }