File use_system_libs.patch of Package freeimage

Index: FreeImage/Makefile.fip
===================================================================
--- FreeImage.orig/Makefile.fip
+++ FreeImage/Makefile.fip
@@ -11,7 +11,7 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-LIBRARIES = -lstdc++
+LIBRARIES = -lstdc++ $(shell pkg-config --libs zlib OpenEXR libraw libpng)
 
 MODULES = $(SRCS:.c=.o)
 MODULES := $(MODULES:.cpp=.o)
Index: FreeImage/Makefile.gnu
===================================================================
--- FreeImage.orig/Makefile.gnu
+++ FreeImage/Makefile.gnu
@@ -11,7 +11,7 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
 
-LIBRARIES = -lstdc++
+LIBRARIES = -lstdc++ $(shell pkg-config --libs zlib OpenEXR libraw libpng)
 
 MODULES = $(SRCS:.c=.o)
 MODULES := $(MODULES:.cpp=.o)
Index: FreeImage/Source/FreeImage/PluginEXR.cpp
===================================================================
--- FreeImage.orig/Source/FreeImage/PluginEXR.cpp
+++ FreeImage/Source/FreeImage/PluginEXR.cpp
@@ -22,16 +22,16 @@
 
 #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/IlmImf/ImfPreviewImage.h"
-#include "../OpenEXR/Half/half.h"
+#include <ImfIO.h>
+#include <Iex.h>
+#include <ImfOutputFile.h>
+#include <ImfInputFile.h>
+#include <ImfRgbaFile.h>
+#include <ImfChannelList.h>
+#include <ImfRgba.h>
+#include <ImfArray.h>
+#include <ImfPreviewImage.h>
+#include <half.h>
 
 
 // ==========================================================
Index: FreeImage/Source/FreeImage/PluginRAW.cpp
===================================================================
--- FreeImage.orig/Source/FreeImage/PluginRAW.cpp
+++ FreeImage/Source/FreeImage/PluginRAW.cpp
@@ -19,7 +19,7 @@
 // Use at your own risk!
 // ==========================================================
 
-#include "../LibRawLite/libraw/libraw.h"
+#include <libraw/libraw.h>
 
 #include "FreeImage.h"
 #include "Utilities.h"
Index: FreeImage/Source/FreeImage/PluginTIFF.cpp
===================================================================
--- FreeImage.orig/Source/FreeImage/PluginTIFF.cpp
+++ FreeImage/Source/FreeImage/PluginTIFF.cpp
@@ -39,7 +39,7 @@
 #include "Utilities.h"
 #include "../LibTIFF4/tiffiop.h"
 #include "../Metadata/FreeImageTag.h"
-#include "../OpenEXR/Half/half.h"
+#include <half.h>
 
 #include "FreeImageIO.h"
 #include "PSDParser.h"
Index: FreeImage/Source/FreeImage/ZLibInterface.cpp
===================================================================
--- FreeImage.orig/Source/FreeImage/ZLibInterface.cpp
+++ FreeImage/Source/FreeImage/ZLibInterface.cpp
@@ -19,10 +19,11 @@
 // 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. 
Index: FreeImage/Source/LibTIFF4/tif_pixarlog.c
===================================================================
--- FreeImage.orig/Source/LibTIFF4/tif_pixarlog.c
+++ FreeImage/Source/LibTIFF4/tif_pixarlog.c
@@ -90,7 +90,7 @@
  */
 
 #include "tif_predict.h"
-#include "../ZLib/zlib.h"
+#include <zlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
Index: FreeImage/Source/LibTIFF4/tif_zip.c
===================================================================
--- FreeImage.orig/Source/LibTIFF4/tif_zip.c
+++ FreeImage/Source/LibTIFF4/tif_zip.c
@@ -47,7 +47,7 @@
  * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
  */
 #include "tif_predict.h"
-#include "../ZLib/zlib.h"
+#include <zlib.h>
 
 #include <stdio.h>
 
Index: FreeImage/genfipsrclist.sh
===================================================================
--- FreeImage.orig/genfipsrclist.sh
+++ FreeImage/genfipsrclist.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src Wrapper/FreeImagePlus"
+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibTIFF4 Source/LibOpenJPEG Wrapper/FreeImagePlus"
 
 
 echo "VER_MAJOR = 3" > fipMakefile.srcs
@@ -19,5 +19,6 @@ echo -n "INCLUDE =" >> fipMakefile.srcs
 for DIR in $DIRLIST; do
 	echo -n " -I$DIR" >> fipMakefile.srcs
 done
+echo ' $(shell pkg-config --cflags libpng libraw OpenEXR zlib)' >> fipMakefile.srcs
 echo >> fipMakefile.srcs
 
Index: FreeImage/gensrclist.sh
===================================================================
--- FreeImage.orig/gensrclist.sh
+++ FreeImage/gensrclist.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibPNG Source/LibTIFF4 Source/ZLib Source/LibOpenJPEG Source/OpenEXR Source/OpenEXR/Half Source/OpenEXR/Iex Source/OpenEXR/IlmImf Source/OpenEXR/IlmThread Source/OpenEXR/Imath Source/LibRawLite Source/LibRawLite/dcraw Source/LibRawLite/internal Source/LibRawLite/libraw Source/LibRawLite/src"
+DIRLIST=". Source Source/Metadata Source/FreeImageToolkit Source/LibJPEG Source/LibTIFF4 Source/LibOpenJPEG"
 
 echo "VER_MAJOR = 3" > Makefile.srcs
 echo "VER_MINOR = 15.4" >> Makefile.srcs
@@ -22,5 +22,6 @@ echo -n "INCLUDE =" >> Makefile.srcs
 for DIR in $DIRLIST; do
 	echo -n " -I$DIR" >> Makefile.srcs
 done
+echo ' $(shell pkg-config --cflags libpng libraw OpenEXR zlib)' >> Makefile.srcs
 echo >> Makefile.srcs