update package freeimage

---
 src/freeimage-1-fixes.patch |   27 +++++++++++++++++----------
 src/freeimage.mk            |    4 ++--
 2 files changed, 19 insertions(+), 12 deletions(-)
This commit is contained in:
Mark Brand 2012-03-25 21:56:47 +02:00
parent 60b0da738c
commit fca2f975c4
2 changed files with 19 additions and 12 deletions

View File

@ -3,13 +3,16 @@ See doc/index.html for further information.
Contains ad hoc patches for cross building.
From 53dfe1821165131a85bbe5db1f238b14843bba2c Mon Sep 17 00:00:00 2001
From 7b90b53e9d48aa13aaa42d60b060fb3ff9a5f11c 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
---
.../Source/LibRawLite/src/libraw_datastream.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Source/LibRawLite/src/libraw_datastream.cpp b/Source/LibRawLite/src/libraw_datastream.cpp
index 33a81b9..c5d57f6 100644
@ -28,17 +31,19 @@ index 33a81b9..c5d57f6 100644
LibRaw_byte_buffer::LibRaw_byte_buffer(unsigned sz)
{
--
1.7.9
1.7.9.2
From 395b4a4ea08a39596b32bee790ccad6bcadd4995 Mon Sep 17 00:00:00 2001
From fa251a7e33ac1c73992a5825a1f1f2fa888af93c 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)
---
FreeImage/Makefile.gnu | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/Makefile.gnu b/Makefile.gnu
index 58f596d..631eb82 100644
index e6007ae..631eb82 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -9,7 +9,7 @@ INCDIR ?= $(DESTDIR)/usr/include
@ -74,21 +79,23 @@ index 58f596d..631eb82 100644
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
- ldconfig
-# ldconfig
+ install -m 644 $(HEADER) $(INCDIR)
+ install -m 644 $(STATICLIB) $(INSTALLDIR)
clean:
rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
--
1.7.9
1.7.9.2
From 363c6de7d01bdc2c6504483307f30131e0fbfeed Mon Sep 17 00:00:00 2001
From 5f52e869fdcc5a18592a6b87b83ce1f6c15a3ac0 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)
---
FreeImage/Makefile.gnu | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.gnu b/Makefile.gnu
index 631eb82..1809017 100644
@ -107,5 +114,5 @@ index 631eb82..1809017 100644
ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--
1.7.9
1.7.9.2

View File

@ -4,8 +4,8 @@
# FreeImage
PKG := freeimage
$(PKG)_IGNORE :=
$(PKG)_VERSION := 3.15.2
$(PKG)_CHECKSUM := f9cd3cbbc506424939cdc6b344e3f2d4bf8efe1c
$(PKG)_VERSION := 3.15.3
$(PKG)_CHECKSUM := 083ef40a1734e33cc34c55ba87019bf5cce9ca4a
$(PKG)_SUBDIR := FreeImage
$(PKG)_FILE := FreeImage$(subst .,,$($(PKG)_VERSION)).zip
$(PKG)_WEBSITE := http://freeimage.sourceforge.net/