Mercurial > mxe-octave
annotate src/freeimage-1-fixes.patch @ 3779:1c0d13ac788e
default-octave: update for change in default octave version number
* src/default-octave.mk: change 4.1.0+ to 3.9.0+
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 01 Feb 2015 13:32:20 -0500 |
parents | a3d573500901 |
children |
rev | line source |
---|---|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
1 This file is part of MXE. |
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
2250 | 3 |
4 Contains ad hoc patches for cross building. | |
5 | |
2832 | 6 From bc927f5ebeb38f83d6b6d36de6f4af679232ca11 Mon Sep 17 00:00:00 2001 |
7 From: Mark Brand <mabrand@mabrand.nl> | |
8 Date: Mon, 20 Feb 2012 08:58:53 +0100 | |
9 Subject: [PATCH 1/3] makefile workarounds (MXE) | |
2250 | 10 |
11 | |
12 diff --git a/Makefile.gnu b/Makefile.gnu | |
2322 | 13 index e6007ae..631eb82 100644 |
2250 | 14 --- a/Makefile.gnu |
15 +++ b/Makefile.gnu | |
16 @@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include | |
17 INSTALLDIR ?= $(DESTDIR)/usr/lib | |
18 | |
19 # Converts cr/lf to just lf | |
20 -DOS2UNIX = dos2unix | |
21 +DOS2UNIX = echo 'dos2unix not needed ' | |
22 | |
23 LIBRARIES = -lstdc++ | |
24 | |
25 @@ -40,13 +40,12 @@ all: dist | |
26 | |
27 dist: FreeImage | |
28 cp *.a Dist | |
29 - cp *.so Dist | |
30 cp Source/FreeImage.h Dist | |
31 | |
32 dos2unix: | |
33 @$(DOS2UNIX) $(SRCS) $(INCLS) | |
34 | |
35 -FreeImage: $(STATICLIB) $(SHAREDLIB) | |
36 +FreeImage: $(STATICLIB) | |
37 | |
38 .c.o: | |
39 $(CC) $(CFLAGS) -c $< -o $@ | |
40 @@ -62,12 +61,8 @@ $(SHAREDLIB): $(MODULES) | |
41 | |
42 install: | |
43 install -d $(INCDIR) $(INSTALLDIR) | |
44 - install -m 644 -o root -g root $(HEADER) $(INCDIR) | |
45 - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) | |
46 - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) | |
47 - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) | |
48 - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) | |
2322 | 49 -# ldconfig |
2250 | 50 + install -m 644 $(HEADER) $(INCDIR) |
51 + install -m 644 $(STATICLIB) $(INSTALLDIR) | |
52 | |
53 clean: | |
54 rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) | |
55 -- | |
2832 | 56 1.7.10.4 |
57 | |
2250 | 58 |
2832 | 59 From d0f85974b3e4057a9779d6dfad7c133f3a05f094 Mon Sep 17 00:00:00 2001 |
60 From: Mark Brand <mabrand@mabrand.nl> | |
2250 | 61 Date: Mon, 20 Feb 2012 09:47:08 +0100 |
2832 | 62 Subject: [PATCH 2/3] required win version (MXE) |
2250 | 63 |
64 | |
65 diff --git a/Makefile.gnu b/Makefile.gnu | |
66 index 631eb82..1809017 100644 | |
67 --- a/Makefile.gnu | |
68 +++ b/Makefile.gnu | |
69 @@ -15,9 +15,9 @@ LIBRARIES = -lstdc++ | |
70 | |
71 MODULES = $(SRCS:.c=.o) | |
72 MODULES := $(MODULES:.cpp=.o) | |
73 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS | |
74 +CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS -DWINVER=0x0501 | |
75 CFLAGS += $(INCLUDE) | |
76 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy | |
77 +CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DWINVER=0x0501 | |
78 CXXFLAGS += $(INCLUDE) | |
79 | |
80 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) | |
81 -- | |
2832 | 82 1.7.10.4 |
83 | |
84 | |
85 From f1a9c3261457568064127586e9c782664bb8df78 Mon Sep 17 00:00:00 2001 | |
86 From: Mark Brand <mabrand@mabrand.nl> | |
87 Date: Sat, 27 Oct 2012 22:57:27 +0200 | |
88 Subject: [PATCH 3/3] include string.h for memset | |
89 | |
90 taken from https://sourceforge.net/tracker/?func=detail&aid=3581223&group_id=11504&atid=311504 | |
2250 | 91 |
2832 | 92 diff --git a/Source/OpenEXR/IlmImf/ImfAutoArray.h b/Source/OpenEXR/IlmImf/ImfAutoArray.h |
93 index edb8b10..0b1378e 100644 | |
94 --- a/Source/OpenEXR/IlmImf/ImfAutoArray.h | |
95 +++ b/Source/OpenEXR/IlmImf/ImfAutoArray.h | |
96 @@ -45,6 +45,10 @@ | |
97 //----------------------------------------------------------------------------- | |
98 | |
99 #include "OpenEXRConfig.h" | |
100 +#ifdef __MINGW32__ | |
101 +// needed for memset | |
102 +#include <string.h> | |
103 +#endif | |
104 | |
105 namespace Imf { | |
106 | |
107 -- | |
108 1.7.10.4 | |
109 |