various packages: enable/disable mingw-w64 builds

1 files changed, 37 insertions, 5 deletions

diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch
index a7dd343..b166db5 100644
--- a/src/freeimage-1-fixes.patch
+++ b/src/freeimage-1-fixes.patch
@@ -3,15 +3,15 @@ See index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From f1a9c3261457568064127586e9c782664bb8df78 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
+From 85f449a5341881f90a6af1dbbb7f3d3cd656bca6 Mon Sep 17 00:00:00 2001
+From: MXE
 Date: Sat, 27 Oct 2012 22:57:27 +0200
-Subject: [PATCH 1/1] include string.h for memset
+Subject: [PATCH 1/2] include string.h for memset
 
 taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504
 
 diff --git a/Source/OpenEXR/IlmImf/ImfAutoArray.h b/Source/OpenEXR/IlmImf/ImfAutoArray.h
-index edb8b10..0b1378e 100644
+index edb8b10..0b1378e 100755
 --- a/Source/OpenEXR/IlmImf/ImfAutoArray.h
 +++ b/Source/OpenEXR/IlmImf/ImfAutoArray.h
 @@ -45,6 +45,10 @@
@@ -26,5 +26,37 @@ index edb8b10..0b1378e 100644
  namespace Imf {
  
 -- 
-1.7.10.4
+1.8.2.2
+
+
+From 1c85f65b9efc06760ac572ba19c1c513f14d4719 Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sat, 11 May 2013 15:15:39 +1000
+Subject: [PATCH 2/2] mingw-w64 fixes
+
+
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index 72218a2..10c86fd 100755
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -35,6 +35,8 @@
+ #undef __unix
+ #endif
+ 
++#include <stdint.h>
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+ #include "../LibTIFF4/tiffiop.h"
+@@ -207,7 +209,7 @@ TIFFFdOpen(thandle_t handle, const char *name, const char *mode) {
+     // 64bit machines (sizeof(int) != sizeof(long)). 
+     // Needs to be fixed within libTIFF.
+ 	if (tif) {
+-		tif->tif_fd = (long)handle;
++		tif->tif_fd = (intptr_t)handle;
+ 	}
+ 
+ 	return tif;
+-- 
+1.8.2.2