From bb8d86d861225ab4b3c67da1f0d6d98a1c9fe7dd Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 3 Sep 2010 18:48:54 +0200
Subject: update package freeimage

---
 src/freeimage-1-no-shared.patch | 21 +++++++++++++++++----
 src/freeimage.mk                |  4 ++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/freeimage-1-no-shared.patch b/src/freeimage-1-no-shared.patch
index 8b4d665..27ec3bb 100644
--- a/src/freeimage-1-no-shared.patch
+++ b/src/freeimage-1-no-shared.patch
@@ -2,8 +2,8 @@ This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
 diff -urN a/Makefile.gnu b/Makefile.gnu
---- a/Makefile.gnu	2009-07-28 06:35:26.000000000 +0200
-+++ b/Makefile.gnu	2010-02-16 11:50:50.509897756 +0100
+--- a/Makefile.gnu	2010-04-29 11:16:50.000000000 +0200
++++ b/Makefile.gnu	2010-09-03 18:38:07.330351960 +0200
 @@ -9,7 +9,7 @@
  INSTALLDIR ?= $(DESTDIR)/usr/lib
  
@@ -28,16 +28,29 @@ diff -urN a/Makefile.gnu b/Makefile.gnu
  
  .c.o:
  	$(CC) $(CFLAGS) -c $< -o $@
-@@ -62,9 +61,8 @@
+@@ -62,12 +61,8 @@
  
  install:
  	install -d $(INCDIR) $(INSTALLDIR)
 -	install -m 644 -o root -g root $(HEADER) $(INCDIR)
 -	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
 -	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
+-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+-	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
+-	ldconfig
 +	install -m 644 $(HEADER) $(INCDIR)
 +	install -m 644 $(STATICLIB) $(INSTALLDIR)
  
  clean:
  	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-# Linux makefile for FreeImage
+diff -urN a/Source/OpenEXR/Imath/ImathMatrix.h b/Source/OpenEXR/Imath/ImathMatrix.h
+--- a/Source/OpenEXR/Imath/ImathMatrix.h	2010-07-17 12:48:40.000000000 +0200
++++ b/Source/OpenEXR/Imath/ImathMatrix.h	2010-09-03 18:38:37.138598422 +0200
+@@ -49,6 +49,7 @@
+ #include "ImathVec.h"
+ #include "ImathShear.h"
+ 
++#include <string.h>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/src/freeimage.mk b/src/freeimage.mk
index 15c6d66..037ed8d 100644
--- a/src/freeimage.mk
+++ b/src/freeimage.mk
@@ -4,8 +4,8 @@
 # FreeImage
 PKG             := freeimage
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.13.1
-$(PKG)_CHECKSUM := 52ba4453aa9682c57104c3420e58f843aaa6ab61
+$(PKG)_VERSION  := 3.14.1
+$(PKG)_CHECKSUM := cc09671e16460c27242280c2b6100f39974c89e1
 $(PKG)_SUBDIR   := FreeImage
 $(PKG)_FILE     := FreeImage$(subst .,,$($(PKG)_VERSION)).zip
 $(PKG)_WEBSITE  := http://freeimage.sourceforge.net/
-- 
cgit v0.12