summaryrefslogtreecommitdiffstats
path: root/src/freeimage-1-fixes.patch
blob: d6466fb6107d51c06577a075e2df7447db7119b0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
This file is part of MXE.
See index.html for further information.

Contains ad hoc patches for cross building.

From bc927f5ebeb38f83d6b6d36de6f4af679232ca11 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 20 Feb 2012 08:58:53 +0100
Subject: [PATCH 1/3] makefile workarounds (MXE)


diff --git a/Makefile.gnu b/Makefile.gnu
index e6007ae..631eb82 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include
 INSTALLDIR ?= $(DESTDIR)/usr/lib
 
 # Converts cr/lf to just lf
-DOS2UNIX = dos2unix
+DOS2UNIX = echo 'dos2unix not needed '
 
 LIBRARIES = -lstdc++
 
@@ -40,13 +40,12 @@ all: dist
 
 dist: FreeImage
 	cp *.a Dist
-	cp *.so Dist
 	cp Source/FreeImage.h Dist
 
 dos2unix:
 	@$(DOS2UNIX) $(SRCS) $(INCLS)
 
-FreeImage: $(STATICLIB) $(SHAREDLIB)
+FreeImage: $(STATICLIB)
 
 .c.o:
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -62,12 +61,8 @@ $(SHAREDLIB): $(MODULES)
 
 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)
-- 
1.7.10.4


From d0f85974b3e4057a9779d6dfad7c133f3a05f094 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 20 Feb 2012 09:47:08 +0100
Subject: [PATCH 2/3] required win version (MXE)


diff --git a/Makefile.gnu b/Makefile.gnu
index 631eb82..1809017 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -15,9 +15,9 @@ LIBRARIES = -lstdc++
 
 MODULES = $(SRCS:.c=.o)
 MODULES := $(MODULES:.cpp=.o)
-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
+CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS -DWINVER=0x0501
 CFLAGS += $(INCLUDE)
-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
+CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DWINVER=0x0501
 CXXFLAGS += $(INCLUDE)
 
 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
-- 
1.7.10.4


From f1a9c3261457568064127586e9c782664bb8df78 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 27 Oct 2012 22:57:27 +0200
Subject: [PATCH 3/3] 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
--- a/Source/OpenEXR/IlmImf/ImfAutoArray.h
+++ b/Source/OpenEXR/IlmImf/ImfAutoArray.h
@@ -45,6 +45,10 @@
 //-----------------------------------------------------------------------------
 
 #include "OpenEXRConfig.h"
+#ifdef __MINGW32__
+// needed for memset
+#include <string.h>
+#endif
 
 namespace Imf {
 
-- 
1.7.10.4