wok rev 6835

Forgot patch for freeimage to compile with gcc 4.5.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Oct 19 21:25:15 2010 +0000 (2010-10-19)
parents 8dd0424ba135
children a83d1412687d
files freeimage/stuff/gcc4.5_ln.patch
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/freeimage/stuff/gcc4.5_ln.patch	Tue Oct 19 21:25:15 2010 +0000
     1.3 @@ -0,0 +1,62 @@
     1.4 +diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip
     1.5 +--- FreeImage.orig//Makefile.fip	2010-08-10 19:15:20.000000000 +0200
     1.6 ++++ FreeImage.new//Makefile.fip	2010-09-12 23:29:36.000000000 +0200
     1.7 +@@ -15,9 +15,9 @@
     1.8 + 
     1.9 + MODULES = $(SRCS:.c=.o)
    1.10 + MODULES := $(MODULES:.cpp=.o)
    1.11 +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    1.12 ++CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    1.13 + CFLAGS += $(INCLUDE)
    1.14 +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    1.15 ++CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    1.16 + CXXFLAGS += $(INCLUDE)
    1.17 + 
    1.18 + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
    1.19 +diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu
    1.20 +--- FreeImage.orig//Makefile.gnu	2010-08-10 19:15:20.000000000 +0200
    1.21 ++++ FreeImage.new//Makefile.gnu	2010-09-12 23:01:57.000000000 +0200
    1.22 +@@ -15,9 +15,9 @@
    1.23 + 
    1.24 + MODULES = $(SRCS:.c=.o)
    1.25 + MODULES := $(MODULES:.cpp=.o)
    1.26 +-CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    1.27 ++CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
    1.28 + CFLAGS += $(INCLUDE)
    1.29 +-CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    1.30 ++CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
    1.31 + CXXFLAGS += $(INCLUDE)
    1.32 + 
    1.33 + ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
    1.34 +@@ -65,9 +65,6 @@
    1.35 + 	install -m 644 -o root -g root $(HEADER) $(INCDIR)
    1.36 + 	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
    1.37 + 	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
    1.38 +-	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
    1.39 +-	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
    1.40 +-	ldconfig
    1.41 + 
    1.42 + clean:
    1.43 + 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
    1.44 +diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp
    1.45 +--- FreeImage.orig//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:15:20.000000000 +0200
    1.46 ++++ FreeImage.new//Source/FreeImageToolkit/Background.cpp	2010-08-10 19:16:12.000000000 +0200
    1.47 +@@ -21,6 +21,7 @@
    1.48 + 
    1.49 + #include "FreeImage.h"
    1.50 + #include "Utilities.h"
    1.51 ++#include <limits.h>
    1.52 + 
    1.53 + /** @brief Determines, whether a palletized image is visually greyscale or not.
    1.54 +  
    1.55 +diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h
    1.56 +--- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 19:15:20.000000000 +0200
    1.57 ++++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h	2010-08-10 21:43:26.000000000 +0200
    1.58 +@@ -51,6 +51,7 @@
    1.59 + 
    1.60 + #include <iostream>
    1.61 + #include <iomanip>
    1.62 ++#include <cstring>
    1.63 + 
    1.64 + #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
    1.65 + // suppress exception specification warnings