Mercurial > mxe-octave
annotate src/freeimage-1-fixes.patch @ 2353:99516e73b368
Move doc/index.html -> index.html
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Thu, 29 Mar 2012 12:14:15 +0200 |
| parents | f653602a0500 |
| children | a3d573500901 |
| 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 | |
| 2322 | 6 From 7b90b53e9d48aa13aaa42d60b060fb3ff9a5f11c Mon Sep 17 00:00:00 2001 |
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
7 From: MXE |
| 2250 | 8 Date: Mon, 20 Feb 2012 09:02:05 +0100 |
| 9 Subject: [PATCH 1/3] add missing header for mingw | |
| 10 | |
| 11 taken from | |
| 12 https://sourceforge.net/tracker/?func=detail&aid=3489514&group_id=11504&atid=311504 | |
| 2322 | 13 --- |
| 14 .../Source/LibRawLite/src/libraw_datastream.cpp | 5 ++++- | |
| 15 1 file changed, 4 insertions(+), 1 deletion(-) | |
| 2250 | 16 |
| 17 diff --git a/Source/LibRawLite/src/libraw_datastream.cpp b/Source/LibRawLite/src/libraw_datastream.cpp | |
| 18 index 33a81b9..c5d57f6 100644 | |
| 19 --- a/Source/LibRawLite/src/libraw_datastream.cpp | |
| 20 +++ b/Source/LibRawLite/src/libraw_datastream.cpp | |
| 21 @@ -8,7 +8,10 @@ | |
| 22 #else | |
| 23 #define NO_JASPER | |
| 24 #endif | |
| 25 - | |
| 26 +#ifdef __MINGW32__ | |
| 27 +#include <stdexcept> | |
| 28 +#include <winbase.h> | |
| 29 +#endif | |
| 30 | |
| 31 LibRaw_byte_buffer::LibRaw_byte_buffer(unsigned sz) | |
| 32 { | |
| 33 -- | |
| 2322 | 34 1.7.9.2 |
| 2250 | 35 |
| 2322 | 36 From fa251a7e33ac1c73992a5825a1f1f2fa888af93c Mon Sep 17 00:00:00 2001 |
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
37 From: MXE |
| 2250 | 38 Date: Mon, 20 Feb 2012 08:58:53 +0100 |
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
39 Subject: [PATCH 2/3] makefile workarounds (MXE) |
| 2250 | 40 |
| 2322 | 41 --- |
| 42 FreeImage/Makefile.gnu | 13 ++++--------- | |
| 43 1 file changed, 4 insertions(+), 9 deletions(-) | |
| 2250 | 44 |
| 45 diff --git a/Makefile.gnu b/Makefile.gnu | |
| 2322 | 46 index e6007ae..631eb82 100644 |
| 2250 | 47 --- a/Makefile.gnu |
| 48 +++ b/Makefile.gnu | |
| 49 @@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include | |
| 50 INSTALLDIR ?= $(DESTDIR)/usr/lib | |
| 51 | |
| 52 # Converts cr/lf to just lf | |
| 53 -DOS2UNIX = dos2unix | |
| 54 +DOS2UNIX = echo 'dos2unix not needed ' | |
| 55 | |
| 56 LIBRARIES = -lstdc++ | |
| 57 | |
| 58 @@ -40,13 +40,12 @@ all: dist | |
| 59 | |
| 60 dist: FreeImage | |
| 61 cp *.a Dist | |
| 62 - cp *.so Dist | |
| 63 cp Source/FreeImage.h Dist | |
| 64 | |
| 65 dos2unix: | |
| 66 @$(DOS2UNIX) $(SRCS) $(INCLS) | |
| 67 | |
| 68 -FreeImage: $(STATICLIB) $(SHAREDLIB) | |
| 69 +FreeImage: $(STATICLIB) | |
| 70 | |
| 71 .c.o: | |
| 72 $(CC) $(CFLAGS) -c $< -o $@ | |
| 73 @@ -62,12 +61,8 @@ $(SHAREDLIB): $(MODULES) | |
| 74 | |
| 75 install: | |
| 76 install -d $(INCDIR) $(INSTALLDIR) | |
| 77 - install -m 644 -o root -g root $(HEADER) $(INCDIR) | |
| 78 - install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) | |
| 79 - install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) | |
| 80 - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) | |
| 81 - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) | |
| 2322 | 82 -# ldconfig |
| 2250 | 83 + install -m 644 $(HEADER) $(INCDIR) |
| 84 + install -m 644 $(STATICLIB) $(INSTALLDIR) | |
| 85 | |
| 86 clean: | |
| 87 rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) | |
| 88 -- | |
| 2322 | 89 1.7.9.2 |
| 2250 | 90 |
| 2322 | 91 From 5f52e869fdcc5a18592a6b87b83ce1f6c15a3ac0 Mon Sep 17 00:00:00 2001 |
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
92 From: MXE |
| 2250 | 93 Date: Mon, 20 Feb 2012 09:47:08 +0100 |
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2322
diff
changeset
|
94 Subject: [PATCH 3/3] required win version (MXE) |
| 2250 | 95 |
| 2322 | 96 --- |
| 97 FreeImage/Makefile.gnu | 4 ++-- | |
| 98 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 2250 | 99 |
| 100 diff --git a/Makefile.gnu b/Makefile.gnu | |
| 101 index 631eb82..1809017 100644 | |
| 102 --- a/Makefile.gnu | |
| 103 +++ b/Makefile.gnu | |
| 104 @@ -15,9 +15,9 @@ LIBRARIES = -lstdc++ | |
| 105 | |
| 106 MODULES = $(SRCS:.c=.o) | |
| 107 MODULES := $(MODULES:.cpp=.o) | |
| 108 -CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS | |
| 109 +CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS -DWINVER=0x0501 | |
| 110 CFLAGS += $(INCLUDE) | |
| 111 -CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy | |
| 112 +CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy -DWINVER=0x0501 | |
| 113 CXXFLAGS += $(INCLUDE) | |
| 114 | |
| 115 ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) | |
| 116 -- | |
| 2322 | 117 1.7.9.2 |
| 2250 | 118 |