mirror of https://git.wownero.com/dsc/mxe.git
update package freeimage
This commit is contained in:
Mark Brand
parent
ee794819b0
commit
e0eabfed4d
|
|
@ -0,0 +1,111 @@
|
|||
This file is part of mingw-cross-env.
|
||||
See doc/index.html for further information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 53dfe1821165131a85bbe5db1f238b14843bba2c Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Mon, 20 Feb 2012 09:02:05 +0100
|
||||
Subject: [PATCH 1/3] add missing header for mingw
|
||||
|
||||
taken from
|
||||
https://sourceforge.net/tracker/?func=detail&aid=3489514&group_id=11504&atid=311504
|
||||
|
||||
diff --git a/Source/LibRawLite/src/libraw_datastream.cpp b/Source/LibRawLite/src/libraw_datastream.cpp
|
||||
index 33a81b9..c5d57f6 100644
|
||||
--- a/Source/LibRawLite/src/libraw_datastream.cpp
|
||||
+++ b/Source/LibRawLite/src/libraw_datastream.cpp
|
||||
@@ -8,7 +8,10 @@
|
||||
#else
|
||||
#define NO_JASPER
|
||||
#endif
|
||||
-
|
||||
+#ifdef __MINGW32__
|
||||
+#include <stdexcept>
|
||||
+#include <winbase.h>
|
||||
+#endif
|
||||
|
||||
LibRaw_byte_buffer::LibRaw_byte_buffer(unsigned sz)
|
||||
{
|
||||
--
|
||||
1.7.9
|
||||
|
||||
|
||||
From 395b4a4ea08a39596b32bee790ccad6bcadd4995 Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Mon, 20 Feb 2012 08:58:53 +0100
|
||||
Subject: [PATCH 2/3] makefile workarounds (mingw-cross-env)
|
||||
|
||||
|
||||
diff --git a/Makefile.gnu b/Makefile.gnu
|
||||
index 58f596d..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.9
|
||||
|
||||
|
||||
From 363c6de7d01bdc2c6504483307f30131e0fbfeed Mon Sep 17 00:00:00 2001
|
||||
From: mingw-cross-env
|
||||
Date: Mon, 20 Feb 2012 09:47:08 +0100
|
||||
Subject: [PATCH 3/3] required win version (mingw-cross-env)
|
||||
|
||||
|
||||
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.9
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
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 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
|
||||
|
||||
# Converts cr/lf to just lf
|
||||
-DOS2UNIX = dos2unix
|
||||
+DOS2UNIX = echo 'dos2unix not needed '
|
||||
|
||||
LIBRARIES = -lstdc++
|
||||
|
||||
@@ -40,13 +40,12 @@
|
||||
|
||||
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 @@
|
||||
|
||||
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)
|
||||
|
|
@ -4,8 +4,8 @@
|
|||
# FreeImage
|
||||
PKG := freeimage
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION := 3.15.1
|
||||
$(PKG)_CHECKSUM := 02ae98007fc64d72a8f15ec3ff24c36ac745fbc8
|
||||
$(PKG)_VERSION := 3.15.2
|
||||
$(PKG)_CHECKSUM := f9cd3cbbc506424939cdc6b344e3f2d4bf8efe1c
|
||||
$(PKG)_SUBDIR := FreeImage
|
||||
$(PKG)_FILE := FreeImage$(subst .,,$($(PKG)_VERSION)).zip
|
||||
$(PKG)_WEBSITE := http://freeimage.sourceforge.net/
|
||||
|
|
|
|||
Loading…
Reference in New Issue