[media-libs/freeimage] version bump to 3.14.1, rewrite (R)DEPEND.

And new patches to make QA happy.

17 files changed, 423 insertions, 12 deletions

diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 6091ffb..8617344 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,12 +1,22 @@
-AUX freeimage-3.13.1-system-jpeg.patch 1792 RMD160 8ed29b1ae31d61266d9fb236a7066cb944cd7c52 SHA1 86292bfe9a92ca089c66f0e52e5508629fc337c1 SHA256 cdb4df2d6c778c283a68e79d6a880e6a5b1b73832c8a4f536d5d14c066e27101
-AUX freeimage-3.13.1-system-libmng.patch 825 RMD160 d2ddeb20b27dc7fdd1788ef2218fa7ba03ad36a1 SHA1 20c65d869ce26e6084aedc525e1fb1f2abc66380 SHA256 4a4a5344d97e4c764170a9bf3850c34f0a2cb02eb0edb3e37a9ade8cb76a78e3
-AUX freeimage-3.13.1-system-libpng.patch 416 RMD160 81a810411ba2643f32d1066cc21a20344529a162 SHA1 519af909f0c368e075b73ac1a46eb3ba44acf8e7 SHA256 4ceb74ceb1253e83c904ab2691275e324b46f0a263c5649e466a4b90b9091873
-AUX freeimage-3.13.1-system-makefile.patch 38967 RMD160 cc831404ea863316f260add1a38f181461ad2402 SHA1 279f34eb6219b8d250f9c444cd10907aed3f59e2 SHA256 356af0c108302adb6556d7465947de390e4f358011d5659709b8a60d686b8b9f
-AUX freeimage-3.13.1-system-openexr.patch 995 RMD160 ba49faff8db418f40290f0828b63944148a93c0e SHA1 588edd302abbf2a39be6bf91933e02e35cea02d7 SHA256 bb10d91f2012c1aec7c9d4bb4c633cbda1ea10ac2abb2f3a5afbe62bb507903a
-AUX freeimage-3.13.1-system-openjpeg.patch 1186 RMD160 9e6f8c9736ec88f4a7e1bcf7350e68fbdc7e119f SHA1 687ac6977c7e989f785f76ed80ee3d75fcf28505 SHA256 49f439285ed6dddea0e5a8f7a7aab14844cf24d3ce52fcb115cae5928fa98115
-AUX freeimage-3.13.1-system-zlib.patch 641 RMD160 1711fe8c78d119aa6d589f3890000502b22b1873 SHA1 7d7f67f21b515fd4f534eb46341731565e04174d SHA256 406f1c1ece178fbe513fcee6ef479141af9cdad8396e9f627ac7099a570bf668
+AUX 3.13.1/freeimage-3.13.1-system-jpeg.patch 1792 RMD160 8ed29b1ae31d61266d9fb236a7066cb944cd7c52 SHA1 86292bfe9a92ca089c66f0e52e5508629fc337c1 SHA256 cdb4df2d6c778c283a68e79d6a880e6a5b1b73832c8a4f536d5d14c066e27101
+AUX 3.13.1/freeimage-3.13.1-system-libmng.patch 825 RMD160 d2ddeb20b27dc7fdd1788ef2218fa7ba03ad36a1 SHA1 20c65d869ce26e6084aedc525e1fb1f2abc66380 SHA256 4a4a5344d97e4c764170a9bf3850c34f0a2cb02eb0edb3e37a9ade8cb76a78e3
+AUX 3.13.1/freeimage-3.13.1-system-libpng.patch 416 RMD160 81a810411ba2643f32d1066cc21a20344529a162 SHA1 519af909f0c368e075b73ac1a46eb3ba44acf8e7 SHA256 4ceb74ceb1253e83c904ab2691275e324b46f0a263c5649e466a4b90b9091873
+AUX 3.13.1/freeimage-3.13.1-system-makefile.patch 38967 RMD160 cc831404ea863316f260add1a38f181461ad2402 SHA1 279f34eb6219b8d250f9c444cd10907aed3f59e2 SHA256 356af0c108302adb6556d7465947de390e4f358011d5659709b8a60d686b8b9f
+AUX 3.13.1/freeimage-3.13.1-system-openexr.patch 995 RMD160 ba49faff8db418f40290f0828b63944148a93c0e SHA1 588edd302abbf2a39be6bf91933e02e35cea02d7 SHA256 bb10d91f2012c1aec7c9d4bb4c633cbda1ea10ac2abb2f3a5afbe62bb507903a
+AUX 3.13.1/freeimage-3.13.1-system-openjpeg.patch 1186 RMD160 9e6f8c9736ec88f4a7e1bcf7350e68fbdc7e119f SHA1 687ac6977c7e989f785f76ed80ee3d75fcf28505 SHA256 49f439285ed6dddea0e5a8f7a7aab14844cf24d3ce52fcb115cae5928fa98115
+AUX 3.13.1/freeimage-3.13.1-system-zlib.patch 641 RMD160 1711fe8c78d119aa6d589f3890000502b22b1873 SHA1 7d7f67f21b515fd4f534eb46341731565e04174d SHA256 406f1c1ece178fbe513fcee6ef479141af9cdad8396e9f627ac7099a570bf668
+AUX 3.14.1/01-freeimage-system-zlib.patch 814 RMD160 19dbdc1d46a69d24d96698486c3aa83a1b94d1ad SHA1 31ba30d3f027c07b0b711cf6f52e4a95a58b100f SHA256 d2d28e79bc48a8a5745e25d09c551ed8c9ef4c0862f92de5d599a1b36db77549
+AUX 3.14.1/02-freeimage-system-openexr.patch 1181 RMD160 6f1be882b930af21f4e63737a34c26e70fb2d16a SHA1 178e49436d164a91fe2c1c79f1fa84dacee0ce73 SHA256 0bc5e2e6b6442df61b20f196363b348a4c5db62393471683b870aaafc621bd20
+AUX 3.14.1/03-freeimage-system-libmng.patch 581 RMD160 560f0ff90f7883cb1e49d1b0251a821f7a890fe6 SHA1 d724fa3faa24d06b63c76b9616aa3c370d53a062 SHA256 84a42cd99c915cf227a5523e53543457cf817ade1c1412193f4da809c439e494
+AUX 3.14.1/04-freeimage-system-libpng.patch 586 RMD160 b48e87751695d7b88c1273ba39d885656cdfaa1f SHA1 38e98cc32f0dc7cd1df5e9a9512ce37b227f2fa9 SHA256 51c1400a0ffe4b063a49bf3766deb03fcd53617e7725c77e666bdb7d134aefb8
+AUX 3.14.1/05-freeimage-system-openjpeg.patch 1441 RMD160 aed1ef88fd1833cc363d2b6ab2d9b86266bfbb82 SHA1 9c561d953432af6ed08615c9ba632475be8a71d3 SHA256 deec7e2d181c80b0832eb5bf8565ad4b4866a078e6ac8c5d73548d1fce3346c3
+AUX 3.14.1/06-freeimage-system-jpeg.patch 2043 RMD160 e60f60150c448e580f94e394db6ede331ac767cb SHA1 0d4442dac430d6cfb749e953c10257961c72f094 SHA256 bbda95e854d70bd5c41411ae7678d3e2d1043ffb89b78ba4bb06046ce2773200
+AUX 3.14.1/07-freeimage-build-system.patch 40424 RMD160 37a526e2257eed829ce4daff71ccf61f8bf7ee72 SHA1 e850a769de554b8cd2ea1b1fd2df5a0170ff5701 SHA256 113d5aa4eae143154bf26ee3844caff3cff695a0d321dc4ddab106be56c8c85d
 AUX freeimage.pc.in 204 RMD160 48e9c97b97e05d067a7813f84c2bfa816184c288 SHA1 df014b2a48c2a60dc720cc4dbb9793896c559ac5 SHA256 235d0bae8f40b79b316f3e14bd6880ec5c0ef45b24d42d8aa550d7731aeaf7b5
 DIST FreeImage3131.pdf 1016008 RMD160 fec57b35f86add1ba6db4fe4e5683e2578f52b00 SHA1 b063252103f22c3ef1712467c74e071c6fa554c5 SHA256 4463b2e023e1793341912417d0e3d99703a4ab2aa9ee60ff2b99c799e013e799
 DIST FreeImage3131.zip 4762843 RMD160 b3f3e7791ded7d3ce76eb2d9c2a5acb5687a16ee SHA1 52ba4453aa9682c57104c3420e58f843aaa6ab61 SHA256 329bd2036e97d5e527ac2f1fdade4a2029bb06ce4cee0e8bca12e211fd7397c6
-EBUILD freeimage-3.13.1.ebuild 1870 RMD160 2ce049771e5e03360b4c66424daa2c5a90e9115f SHA1 1756f96926c09fcbe606dc32c9e08123a51df55b SHA256 deb2f0bfbc57a28183bdf49f1a361ee4093efe9ab3845e7319c77eb4702edf6d
+DIST FreeImage3141.pdf 996168 RMD160 9bd2c03aa66b6237e80778a4f970f9cbf1504fd5 SHA1 09c3bae67dab1cdf5718a327374fb3248250c64e SHA256 8590e7b56d5f047e4ff6644c9e284288221d7009b68972e79163c6c3cf01a057
+DIST FreeImage3141.zip 10865165 RMD160 5432f0aa922992ac74e5fefc115c1442bb48ce76 SHA1 cc09671e16460c27242280c2b6100f39974c89e1 SHA256 d5c5b5ea96897f4b81e79a37b1149a12bb396039002f22d32f9f98f6b96cff65
+EBUILD freeimage-3.13.1.ebuild 1875 RMD160 e83094ae38c9c692ff1bda6c99c46b51f2b591e5 SHA1 2507428ce73e7847449e48a95bea18ecea5b451f SHA256 f4639f6bdd6f5d0d41a58f7a7c84d7dffd0042401ed5cd4a902d18135b3f46b9
+EBUILD freeimage-3.14.1.ebuild 1875 RMD160 e83094ae38c9c692ff1bda6c99c46b51f2b591e5 SHA1 2507428ce73e7847449e48a95bea18ecea5b451f SHA256 f4639f6bdd6f5d0d41a58f7a7c84d7dffd0042401ed5cd4a902d18135b3f46b9
 MISC metadata.xml 344 RMD160 2dea5cc525000969b977040122e991f082cde116 SHA1 dedbba63c3744f30051758d8db599a8b77f940cf SHA256 6c346802e0ea86aaee5c5fa6fcd64b77541128d988110967090484cb6c46cedf
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-jpeg.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-jpeg.patch
index b09d2a6..b09d2a6 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-jpeg.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-jpeg.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-libmng.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-libmng.patch
index d15db5f..d15db5f 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-libmng.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-libmng.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-libpng.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-libpng.patch
index e20d180..e20d180 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-libpng.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-libpng.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-makefile.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-makefile.patch
index 7419980..7419980 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-makefile.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-makefile.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-openexr.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-openexr.patch
index c0fcfa1..c0fcfa1 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-openexr.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-openexr.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-openjpeg.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-openjpeg.patch
index cbe98a4..cbe98a4 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-openjpeg.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-openjpeg.patch
diff --git a/media-libs/freeimage/files/freeimage-3.13.1-system-zlib.patch b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-zlib.patch
index 16722c2..16722c2 100644
--- a/media-libs/freeimage/files/freeimage-3.13.1-system-zlib.patch
+++ b/media-libs/freeimage/files/3.13.1/freeimage-3.13.1-system-zlib.patch
diff --git a/media-libs/freeimage/files/3.14.1/01-freeimage-system-zlib.patch b/media-libs/freeimage/files/3.14.1/01-freeimage-system-zlib.patch
new file mode 100644
index 0000000..1835f7d
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/01-freeimage-system-zlib.patch
@@ -0,0 +1,28 @@
+System zlib
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/ZLibInterface.cpp |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+
+diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
+index 47fa161..3512ed5 100644
+--- a/Source/FreeImage/ZLibInterface.cpp
++++ b/Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!

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

+ 

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

++#include <zlib.h>

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */

++#define OS_CODE 0x03

+ 

+ /**

+ Compresses a source buffer into a target buffer, using the ZLib library. 

diff --git a/media-libs/freeimage/files/3.14.1/02-freeimage-system-openexr.patch b/media-libs/freeimage/files/3.14.1/02-freeimage-system-openexr.patch
new file mode 100644
index 0000000..90a1972
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/02-freeimage-system-openexr.patch
@@ -0,0 +1,40 @@
+System OpenEXR
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/PluginEXR.cpp |   18 +++++++++---------
+ 1 files changed, 9 insertions(+), 9 deletions(-)
+
+
+diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
+index 6eff52a..17e2c11 100644
+--- a/Source/FreeImage/PluginEXR.cpp
++++ b/Source/FreeImage/PluginEXR.cpp
+@@ -22,15 +22,15 @@
+ 

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../OpenEXR/IlmImf/ImfIO.h"

+-#include "../OpenEXR/Iex/Iex.h"

+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"

+-#include "../OpenEXR/IlmImf/ImfInputFile.h"

+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"

+-#include "../OpenEXR/IlmImf/ImfChannelList.h"

+-#include "../OpenEXR/IlmImf/ImfRgba.h"

+-#include "../OpenEXR/IlmImf/ImfArray.h"

+-#include "../OpenEXR/Half/half.h"

++#include "OpenEXR/ImfIO.h"

++#include "OpenEXR/Iex.h"

++#include "OpenEXR/ImfOutputFile.h"

++#include "OpenEXR/ImfInputFile.h"

++#include "OpenEXR/ImfRgbaFile.h"

++#include "OpenEXR/ImfChannelList.h"

++#include "OpenEXR/ImfRgba.h"

++#include "OpenEXR/ImfArray.h"

++#include "OpenEXR/half.h"

+ 

+ 

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

diff --git a/media-libs/freeimage/files/3.14.1/03-freeimage-system-libmng.patch b/media-libs/freeimage/files/3.14.1/03-freeimage-system-libmng.patch
new file mode 100644
index 0000000..0e98dad
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/03-freeimage-system-libmng.patch
@@ -0,0 +1,24 @@
+System libmng
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/PluginMNG.cpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+
+diff --git a/Source/FreeImage/PluginMNG.cpp b/Source/FreeImage/PluginMNG.cpp
+index 775b126..7472842 100644
+--- a/Source/FreeImage/PluginMNG.cpp
++++ b/Source/FreeImage/PluginMNG.cpp
+@@ -22,7 +22,7 @@
+ #include "FreeImage.h"

+ #include "Utilities.h"

+ 

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

++#include "libmng.h"

+ //#include "../LibMNG/libmng_data.h"

+ 

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

diff --git a/media-libs/freeimage/files/3.14.1/04-freeimage-system-libpng.patch b/media-libs/freeimage/files/3.14.1/04-freeimage-system-libpng.patch
new file mode 100644
index 0000000..80bece6
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/04-freeimage-system-libpng.patch
@@ -0,0 +1,25 @@
+System libpng
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/PluginPNG.cpp |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+
+diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
+index f788b4b..499ea37 100644
+--- a/Source/FreeImage/PluginPNG.cpp
++++ b/Source/FreeImage/PluginPNG.cpp
+@@ -37,7 +37,8 @@
+ 

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

+ 

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

++#define PNG_iTXt_SUPPORTED

++#include <png.h>

+ 

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

+ 

diff --git a/media-libs/freeimage/files/3.14.1/05-freeimage-system-openjpeg.patch b/media-libs/freeimage/files/3.14.1/05-freeimage-system-openjpeg.patch
new file mode 100644
index 0000000..4638786
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/05-freeimage-system-openjpeg.patch
@@ -0,0 +1,52 @@
+System OpenJPEG
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/J2KHelper.cpp |    2 +-
+ Source/FreeImage/PluginJ2K.cpp |    2 +-
+ Source/FreeImage/PluginJP2.cpp |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+
+diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
+index 20eb135..35bb063 100644
+--- a/Source/FreeImage/J2KHelper.cpp
++++ b/Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+ 

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../LibOpenJPEG/openjpeg.h"

++#include "openjpeg.h"

+ 

+ /**

+ Divide an integer by a power of 2 and round upwards

+diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
+index a4bb09e..1e46a43 100644
+--- a/Source/FreeImage/PluginJ2K.cpp
++++ b/Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+ 

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../LibOpenJPEG/openjpeg.h"

++#include <openjpeg.h>

+ 

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

+ // Plugin Interface

+diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
+index 74f52f3..d66565c 100644
+--- a/Source/FreeImage/PluginJP2.cpp
++++ b/Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+ 

+ #include "FreeImage.h"

+ #include "Utilities.h"

+-#include "../LibOpenJPEG/openjpeg.h"

++#include <openjpeg.h>

+ 

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

+ // Plugin Interface

diff --git a/media-libs/freeimage/files/3.14.1/06-freeimage-system-jpeg.patch b/media-libs/freeimage/files/3.14.1/06-freeimage-system-jpeg.patch
new file mode 100644
index 0000000..63687e6
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/06-freeimage-system-jpeg.patch
@@ -0,0 +1,70 @@
+System jpeg
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Source/FreeImage/PluginJPEG.cpp           |    8 +++++---
+ Source/FreeImageToolkit/JPEGTransform.cpp |   14 +++++++-------
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index 41d4169..e2f7594 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -34,9 +34,10 @@ extern "C" {
+ #undef FAR

+ #include <setjmp.h>

+ 

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

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

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

++#include <sys/types.h>

++#include <stdio.h>

++#include <jpeglib.h>

++#include <jerror.h>

+ }

+ 

+ #include "FreeImage.h"

+@@ -44,6 +45,7 @@ extern "C" {
+ 

+ #include "../Metadata/FreeImageTag.h"

+ 

++#define SIZEOF(object)  ((size_t) sizeof(object))

+ 

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

+ // Plugin Interface

+diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
+index 5b5fcef..9ae8701 100644
+--- a/Source/FreeImageToolkit/JPEGTransform.cpp
++++ b/Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -25,12 +25,12 @@ extern "C" {
+ #undef FAR

+ #include <setjmp.h>

+ 

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

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

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

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

+-}

+-

++#include <sys/types.h>

++#include <stdio.h>

++#include <jpeglib.h>

++#include <jerror.h>
++#include "../LibJPEG/transupp.h"
++}
+ #include "FreeImage.h"

+ #include "Utilities.h"

+ 

+@@ -262,7 +262,7 @@ LosslessTransform(const FilenameIO *filenameIO, FREE_IMAGE_JPEG_OPERATION operat
+ 		jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);

+ 		

+ 		// Execute image transformation, if any

+-		jtransform_execute_transformation(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);

++		jtransform_execute_transform(&srcinfo, &dstinfo, src_coef_arrays, &transfoptions);

+ 		

+ 		// Finish compression and release memory

+ 		jpeg_finish_compress(&dstinfo);

diff --git a/media-libs/freeimage/files/3.14.1/07-freeimage-build-system.patch b/media-libs/freeimage/files/3.14.1/07-freeimage-build-system.patch
new file mode 100644
index 0000000..7b68ab0
--- /dev/null
+++ b/media-libs/freeimage/files/3.14.1/07-freeimage-build-system.patch
@@ -0,0 +1,91 @@
+Rewriting build system
+
+From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+
+---
+
+ Makefile.fip     |    6 +++---
+ Makefile.gnu     |    7 +++----
+ Makefile.srcs    |    6 +++---
+ fipMakefile.srcs |    4 ++--
+ 4 files changed, 11 insertions(+), 12 deletions(-)
+
+
+diff --git a/Makefile.fip b/Makefile.fip
+index 216ea55..278722b 100644
+--- a/Makefile.fip
++++ b/Makefile.fip
+@@ -11,14 +11,14 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf

+ DOS2UNIX = dos2unix

+ 

+-LIBRARIES = -lstdc++

++LIBRARIES = -lstdc++ `pkg-config --libs OpenEXR libpng` -ljpeg -lmng -ltiff -lopenjpeg -lz

+ 

+ MODULES = $(SRCS:.c=.o)

+ MODULES := $(MODULES:.cpp=.o)

+ CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

+-CFLAGS += $(INCLUDE)

++CFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`

+ CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

+-CXXFLAGS += $(INCLUDE)

++CXXFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`

+ 

+ ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

+ 	CFLAGS += -fPIC

+diff --git a/Makefile.gnu b/Makefile.gnu
+index 625faf4..151dd13 100644
+--- a/Makefile.gnu
++++ b/Makefile.gnu
+@@ -11,14 +11,14 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf

+ DOS2UNIX = dos2unix

+ 

+-LIBRARIES = -lstdc++

++LIBRARIES = -lstdc++ `pkg-config --libs OpenEXR libpng` -ljpeg -lmng -ltiff -lopenjpeg -lz

+ 

+ MODULES = $(SRCS:.c=.o)

+ MODULES := $(MODULES:.cpp=.o)

+ CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS

+-CFLAGS += $(INCLUDE)

++CFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`

+ CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy

+-CXXFLAGS += $(INCLUDE)

++CXXFLAGS += $(INCLUDE) `pkg-config --cflags OpenEXR libpng`

+ 

+ ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)

+ 	CFLAGS += -fPIC

+@@ -67,7 +67,6 @@ install:
+ 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)

+ 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)

+ 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	

+-	ldconfig

+ 

+ clean:

+ 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)

+diff --git a/Makefile.srcs b/Makefile.srcs
+index 75f77dd..1021275 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -1,6 +1,6 @@
+ VER_MAJOR = 3

+ VER_MINOR = 14.1

+-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ././Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/./jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/./jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/./jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibMNG/libmng_callback_xs.c Source/LibMNG/libmng_chunk_descr.c Source/LibMNG/libmng_chunk_io.c Source/LibMNG/libmng_chunk_prc.c Source/LibMNG/libmng_chunk_xs.c Source/LibMNG/libmng_cms.c Source/LibMNG/libmng_display.c Source/LibMNG/libmng_dither.c Source/LibMNG/libmng_error.c Source/LibMNG/libmng_filter.c Source/LibMNG/libmng_hlapi.c Source/LibMNG/libmng_jpeg.c Source/LibMNG/libmng_object_prc.c Source/LibMNG/libmng_pixels.c Source/LibMNG/libmng_prop_xs.c Source/LibMNG/libmng_read.c Source/LibMNG/libmng_trace.c Source/LibMNG/libmng_write.c Source/LibMNG/libmng_zlib.c Source/LibPNG/./png.c Source/LibPNG/./pngerror.c Source/LibPNG/./pngget.c Source/LibPNG/./pngmem.c Source/LibPNG/./pngpread.c Source/LibPNG/./pngread.c Source/LibPNG/./pngrio.c Source/LibPNG/./pngrtran.c Source/LibPNG/./pngrutil.c Source/LibPNG/./pngset.c Source/LibPNG/./pngtrans.c Source/LibPNG/./pngwio.c Source/LibPNG/./pngwrite.c Source/LibPNG/./pngwtran.c Source/LibPNG/./pngwutil.c Source/LibTIFF/tif_aux.c Source/LibTIFF/tif_close.c Source/LibTIFF/tif_codec.c Source/LibTIFF/tif_color.c Source/LibTIFF/tif_compress.c Source/LibTIFF/tif_dir.c Source/LibTIFF/tif_dirinfo.c Source/LibTIFF/tif_dirread.c Source/LibTIFF/tif_dirwrite.c Source/LibTIFF/tif_dumpmode.c Source/LibTIFF/tif_error.c Source/LibTIFF/tif_extension.c Source/LibTIFF/tif_fax3.c Source/LibTIFF/tif_fax3sm.c Source/LibTIFF/tif_flush.c Source/LibTIFF/tif_getimage.c Source/LibTIFF/tif_jpeg.c Source/LibTIFF/tif_luv.c Source/LibTIFF/tif_lzw.c Source/LibTIFF/tif_next.c Source/LibTIFF/./tif_ojpeg.c Source/LibTIFF/tif_open.c Source/LibTIFF/tif_packbits.c Source/LibTIFF/tif_pixarlog.c Source/LibTIFF/tif_predict.c Source/LibTIFF/tif_print.c Source/LibTIFF/tif_read.c Source/LibTIFF/tif_strip.c Source/LibTIFF/tif_swab.c Source/LibTIFF/tif_thunder.c Source/LibTIFF/tif_tile.c Source/LibTIFF/tif_version.c Source/LibTIFF/tif_warning.c Source/LibTIFF/tif_write.c Source/LibTIFF/tif_zip.c Source/ZLib/./adler32.c Source/ZLib/./compress.c Source/ZLib/./crc32.c Source/ZLib/./deflate.c Source/ZLib/./infback.c Source/ZLib/./inffast.c Source/ZLib/./inflate.c Source/ZLib/./inftrees.c Source/ZLib/./trees.c Source/ZLib/./uncompr.c Source/ZLib/./zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/j2k_lib.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/jpt.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/./IlmImf/ImfAttribute.cpp Source/OpenEXR/./IlmImf/ImfB44Compressor.cpp Source/OpenEXR/./IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/./IlmImf/ImfChannelList.cpp Source/OpenEXR/./IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/./IlmImf/ImfChromaticities.cpp Source/OpenEXR/./IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressor.cpp Source/OpenEXR/./IlmImf/ImfConvert.cpp Source/OpenEXR/./IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/./IlmImf/ImfEnvmap.cpp Source/OpenEXR/./IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/./IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/./IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/./IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/./IlmImf/ImfHeader.cpp Source/OpenEXR/./IlmImf/ImfHuf.cpp Source/OpenEXR/./IlmImf/ImfInputFile.cpp Source/OpenEXR/./IlmImf/ImfIntAttribute.cpp Source/OpenEXR/./IlmImf/ImfIO.cpp Source/OpenEXR/./IlmImf/ImfKeyCode.cpp Source/OpenEXR/./IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/./IlmImf/ImfLut.cpp Source/OpenEXR/./IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/./IlmImf/ImfMisc.cpp Source/OpenEXR/./IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/./IlmImf/ImfOutputFile.cpp Source/OpenEXR/./IlmImf/ImfPizCompressor.cpp Source/OpenEXR/./IlmImf/ImfPreviewImage.cpp Source/OpenEXR/./IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/./IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/./IlmImf/ImfRational.cpp Source/OpenEXR/./IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/./IlmImf/ImfRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfRgbaYca.cpp Source/OpenEXR/./IlmImf/ImfRleCompressor.cpp Source/OpenEXR/./IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/./IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/./IlmImf/ImfStdIO.cpp Source/OpenEXR/./IlmImf/ImfStringAttribute.cpp Source/OpenEXR/./IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/./IlmImf/ImfTestFile.cpp Source/OpenEXR/./IlmImf/ImfThreading.cpp Source/OpenEXR/./IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/./IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledMisc.cpp Source/OpenEXR/./IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfTileOffsets.cpp Source/OpenEXR/./IlmImf/ImfTimeCode.cpp Source/OpenEXR/./IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfVecAttribute.cpp Source/OpenEXR/./IlmImf/ImfVersion.cpp Source/OpenEXR/./IlmImf/ImfWav.cpp Source/OpenEXR/./IlmImf/ImfZipCompressor.cpp Source/OpenEXR/./Imath/ImathBox.cpp Source/OpenEXR/./Imath/ImathColorAlgo.cpp Source/OpenEXR/./Imath/ImathFun.cpp Source/OpenEXR/./Imath/ImathMatrixAlgo.cpp Source/OpenEXR/./Imath/ImathRandom.cpp Source/OpenEXR/./Imath/ImathShear.cpp Source/OpenEXR/./Imath/ImathVec.cpp Source/OpenEXR/./Iex/IexBaseExc.cpp Source/OpenEXR/./Iex/IexThrowErrnoExc.cpp Source/OpenEXR/./Half/half.cpp Source/OpenEXR/./IlmThread/IlmThread.cpp Source/OpenEXR/./IlmThread/IlmThreadMutex.cpp Source/OpenEXR/./IlmThread/IlmThreadPool.cpp Source/OpenEXR/./IlmThread/IlmThreadSemaphore.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp 

+-INCLS = ./Source/FreeImage.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/CacheFile.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/tgt.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/fix.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/j2k_lib.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/int.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/jpt.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/dwt.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Utilities.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/transupp.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jerror.h ./Source/LibMNG/libmng_display.h ./Source/LibMNG/libmng_dither.h ./Source/LibMNG/libmng_trace.h ./Source/LibMNG/libmng_chunks.h ./Source/LibMNG/libmng_filter.h ./Source/LibMNG/libmng_read.h ./Source/LibMNG/libmng_objects.h ./Source/LibMNG/libmng_cms.h ./Source/LibMNG/libmng_chunk_io.h ./Source/LibMNG/libmng_jpeg.h ./Source/LibMNG/libmng_memory.h ./Source/LibMNG/libmng_zlib.h ./Source/LibMNG/libmng_object_prc.h ./Source/LibMNG/libmng_write.h ./Source/LibMNG/libmng_data.h ./Source/LibMNG/libmng_conf.h ./Source/LibMNG/libmng_types.h ./Source/LibMNG/libmng_chunk_descr.h ./Source/LibMNG/libmng_pixels.h ./Source/LibMNG/libmng_chunk_prc.h ./Source/LibMNG/libmng_error.h ./Source/LibMNG/libmng.h ./Source/LibPNG/png.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngconf.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/FreeImageIO.h ./Source/LibTIFF/tiff.h ./Source/LibTIFF/tif_config.vc.h ./Source/LibTIFF/tiffvers.h ./Source/LibTIFF/tif_dir.h ./Source/LibTIFF/tif_predict.h ./Source/LibTIFF/tif_config.wince.h ./Source/LibTIFF/tiffconf.vc.h ./Source/LibTIFF/tiffconf.wince.h ./Source/LibTIFF/t4.h ./Source/LibTIFF/tiffiop.h ./Source/LibTIFF/uvcode.h ./Source/LibTIFF/tiffio.h ./Source/LibTIFF/tif_config.h ./Source/LibTIFF/tif_fax3.h ./Source/ZLib/inflate.h ./Source/ZLib/trees.h ./Source/ZLib/gzguts.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/crc32.h ./Source/ZLib/inftrees.h ./Source/ZLib/zutil.h ./Source/ZLib/inffixed.h ./Source/ZLib/inffast.h ./Source/ZLib/deflate.h ./Source/FreeImage/PSDParser.h ./Source/ToneMapping.h ./Source/DeprecationManager/DeprecationMgr.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/test/fipTest.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./TestAPI/vld-10/vldapi.h ./TestAPI/vld-10/vld.h ./TestAPI/TestSuite.h

++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ././Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp  Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp Source/LibJPEG/transupp.c

++INCLS = ./Source/FreeImage.h ./Source/CacheFile.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/Utilities.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibJPEG/transupp.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/FreeImageIO.h  ./Source/LibTIFF/tiffiop.h ./Source/FreeImage/PSDParser.h ./Source/ToneMapping.h ./Source/DeprecationManager/DeprecationMgr.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/test/fipTest.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./TestAPI/vld-10/vldapi.h ./TestAPI/vld-10/vld.h ./TestAPI/TestSuite.h

+ 

+-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibMNG -ISource/LibPNG -ISource/LibTIFF -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src

++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src

+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index 6101393..f615969 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -1,4 +1,4 @@
+ VER_MAJOR = 3

+ VER_MINOR = 14.1

+-SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ././Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/./jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/./jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/./jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibMNG/libmng_callback_xs.c Source/LibMNG/libmng_chunk_descr.c Source/LibMNG/libmng_chunk_io.c Source/LibMNG/libmng_chunk_prc.c Source/LibMNG/libmng_chunk_xs.c Source/LibMNG/libmng_cms.c Source/LibMNG/libmng_display.c Source/LibMNG/libmng_dither.c Source/LibMNG/libmng_error.c Source/LibMNG/libmng_filter.c Source/LibMNG/libmng_hlapi.c Source/LibMNG/libmng_jpeg.c Source/LibMNG/libmng_object_prc.c Source/LibMNG/libmng_pixels.c Source/LibMNG/libmng_prop_xs.c Source/LibMNG/libmng_read.c Source/LibMNG/libmng_trace.c Source/LibMNG/libmng_write.c Source/LibMNG/libmng_zlib.c Source/LibPNG/./png.c Source/LibPNG/./pngerror.c Source/LibPNG/./pngget.c Source/LibPNG/./pngmem.c Source/LibPNG/./pngpread.c Source/LibPNG/./pngread.c Source/LibPNG/./pngrio.c Source/LibPNG/./pngrtran.c Source/LibPNG/./pngrutil.c Source/LibPNG/./pngset.c Source/LibPNG/./pngtrans.c Source/LibPNG/./pngwio.c Source/LibPNG/./pngwrite.c Source/LibPNG/./pngwtran.c Source/LibPNG/./pngwutil.c Source/LibTIFF/tif_aux.c Source/LibTIFF/tif_close.c Source/LibTIFF/tif_codec.c Source/LibTIFF/tif_color.c Source/LibTIFF/tif_compress.c Source/LibTIFF/tif_dir.c Source/LibTIFF/tif_dirinfo.c Source/LibTIFF/tif_dirread.c Source/LibTIFF/tif_dirwrite.c Source/LibTIFF/tif_dumpmode.c Source/LibTIFF/tif_error.c Source/LibTIFF/tif_extension.c Source/LibTIFF/tif_fax3.c Source/LibTIFF/tif_fax3sm.c Source/LibTIFF/tif_flush.c Source/LibTIFF/tif_getimage.c Source/LibTIFF/tif_jpeg.c Source/LibTIFF/tif_luv.c Source/LibTIFF/tif_lzw.c Source/LibTIFF/tif_next.c Source/LibTIFF/./tif_ojpeg.c Source/LibTIFF/tif_open.c Source/LibTIFF/tif_packbits.c Source/LibTIFF/tif_pixarlog.c Source/LibTIFF/tif_predict.c Source/LibTIFF/tif_print.c Source/LibTIFF/tif_read.c Source/LibTIFF/tif_strip.c Source/LibTIFF/tif_swab.c Source/LibTIFF/tif_thunder.c Source/LibTIFF/tif_tile.c Source/LibTIFF/tif_version.c Source/LibTIFF/tif_warning.c Source/LibTIFF/tif_write.c Source/LibTIFF/tif_zip.c Source/ZLib/./adler32.c Source/ZLib/./compress.c Source/ZLib/./crc32.c Source/ZLib/./deflate.c Source/ZLib/./infback.c Source/ZLib/./inffast.c Source/ZLib/./inflate.c Source/ZLib/./inftrees.c Source/ZLib/./trees.c Source/ZLib/./uncompr.c Source/ZLib/./zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/j2k_lib.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/jpt.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/./IlmImf/ImfAttribute.cpp Source/OpenEXR/./IlmImf/ImfB44Compressor.cpp Source/OpenEXR/./IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/./IlmImf/ImfChannelList.cpp Source/OpenEXR/./IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/./IlmImf/ImfChromaticities.cpp Source/OpenEXR/./IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/./IlmImf/ImfCompressor.cpp Source/OpenEXR/./IlmImf/ImfConvert.cpp Source/OpenEXR/./IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/./IlmImf/ImfEnvmap.cpp Source/OpenEXR/./IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/./IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/./IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/./IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/./IlmImf/ImfHeader.cpp Source/OpenEXR/./IlmImf/ImfHuf.cpp Source/OpenEXR/./IlmImf/ImfInputFile.cpp Source/OpenEXR/./IlmImf/ImfIntAttribute.cpp Source/OpenEXR/./IlmImf/ImfIO.cpp Source/OpenEXR/./IlmImf/ImfKeyCode.cpp Source/OpenEXR/./IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/./IlmImf/ImfLut.cpp Source/OpenEXR/./IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/./IlmImf/ImfMisc.cpp Source/OpenEXR/./IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/./IlmImf/ImfOutputFile.cpp Source/OpenEXR/./IlmImf/ImfPizCompressor.cpp Source/OpenEXR/./IlmImf/ImfPreviewImage.cpp Source/OpenEXR/./IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/./IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/./IlmImf/ImfRational.cpp Source/OpenEXR/./IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/./IlmImf/ImfRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfRgbaYca.cpp Source/OpenEXR/./IlmImf/ImfRleCompressor.cpp Source/OpenEXR/./IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/./IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/./IlmImf/ImfStdIO.cpp Source/OpenEXR/./IlmImf/ImfStringAttribute.cpp Source/OpenEXR/./IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/./IlmImf/ImfTestFile.cpp Source/OpenEXR/./IlmImf/ImfThreading.cpp Source/OpenEXR/./IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/./IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledMisc.cpp Source/OpenEXR/./IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/./IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/./IlmImf/ImfTileOffsets.cpp Source/OpenEXR/./IlmImf/ImfTimeCode.cpp Source/OpenEXR/./IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/./IlmImf/ImfVecAttribute.cpp Source/OpenEXR/./IlmImf/ImfVersion.cpp Source/OpenEXR/./IlmImf/ImfWav.cpp Source/OpenEXR/./IlmImf/ImfZipCompressor.cpp Source/OpenEXR/./Imath/ImathBox.cpp Source/OpenEXR/./Imath/ImathColorAlgo.cpp Source/OpenEXR/./Imath/ImathFun.cpp Source/OpenEXR/./Imath/ImathMatrixAlgo.cpp Source/OpenEXR/./Imath/ImathRandom.cpp Source/OpenEXR/./Imath/ImathShear.cpp Source/OpenEXR/./Imath/ImathVec.cpp Source/OpenEXR/./Iex/IexBaseExc.cpp Source/OpenEXR/./Iex/IexThrowErrnoExc.cpp Source/OpenEXR/./Half/half.cpp Source/OpenEXR/./IlmThread/IlmThread.cpp Source/OpenEXR/./IlmThread/IlmThreadMutex.cpp Source/OpenEXR/./IlmThread/IlmThreadPool.cpp Source/OpenEXR/./IlmThread/IlmThreadSemaphore.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 

+-INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibMNG -ISource/LibPNG -ISource/LibTIFF -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -IWrapper/FreeImagePlus

++SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ././Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ././Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ././Source/FreeImage/PluginJ2K.cpp ././Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ././Source/FreeImage/PluginPFM.cpp ././Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ././Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ././Source/FreeImage/PSDParser.cpp ././Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ././Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ././Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ././Source/DeprecationManager/Deprecated.cpp ./Source/DeprecationManager/DeprecationMgr.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ././Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ././Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibRawLite/./internal/dcraw_common.cpp Source/LibRawLite/./internal/dcraw_fileio.cpp Source/LibRawLite/./src/libraw_c_api.cpp Source/LibRawLite/./src/libraw_cxx.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp Source/LibJPEG/transupp.c

++INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -IWrapper/FreeImagePlus

diff --git a/media-libs/freeimage/freeimage-3.13.1.ebuild b/media-libs/freeimage/freeimage-3.13.1.ebuild
index da03254..913be6f 100644
--- a/media-libs/freeimage/freeimage-3.13.1.ebuild
+++ b/media-libs/freeimage/freeimage-3.13.1.ebuild
@@ -17,22 +17,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cxx doc"
 
-DEPEND="
+RDEPEND="
 	media-libs/jpeg
 	media-libs/libmng
 	media-libs/libpng
 	media-libs/tiff
 	sys-libs/zlib
 	media-libs/openjpeg
-	media-libs/openexr
+	media-libs/openexr"
+DEPEND="${RDEPEND}
 	app-arch/unzip"
-RDEPEND=""
 
 S=${WORKDIR}/${MY_PN}
 
 src_prepare() {
 	append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
-	epatch "${FILESDIR}"/${P}-system-{jpeg,openjpeg,libmng,libpng,openexr,zlib,makefile}.patch
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
 }
 
 src_compile() {
diff --git a/media-libs/freeimage/freeimage-3.14.1.ebuild b/media-libs/freeimage/freeimage-3.14.1.ebuild
new file mode 100644
index 0000000..913be6f
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.14.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN=FreeImage
+MY_P=${MY_PN}${PV//.}
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	doc? ( mirror://sourceforge/${PN}/${MY_P}.pdf )"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cxx doc"
+
+RDEPEND="
+	media-libs/jpeg
+	media-libs/libmng
+	media-libs/libpng
+	media-libs/tiff
+	sys-libs/zlib
+	media-libs/openjpeg
+	media-libs/openexr"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+	append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" epatch
+}
+
+src_compile() {
+	emake -f Makefile.gnu || die "emake failed"
+	if use cxx ; then
+		emake -f Makefile.fip || die "emake fip failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+		-f Makefile.gnu install || die
+	if use cxx ; then
+		emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+			-f Makefile.fip install
+	fi
+	dodoc README.linux Whatsnew.txt
+	use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
+
+	ebegin "Installing ${PN}.pc file"
+	dodir /usr/$(get_libdir)/pkgconfig
+	sed \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		-e "s:@PACKAGENAME@:${MY_PN}:" \
+		-e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+		-e "s:@REQUIRES@:OpenEXR libpng:" \
+		-e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBS@:-lfreeimage -lfreeimageplus:" \
+		-e "s:@EXTLIBS@:-ljpeg -lmng -ltiff -lopenjpeg -lz:" \
+		"${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"	|| die
+	eend $?
+	PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
+		|| die ".pc file failed to validate."
+}