# HG changeset patch # User Mark Brand # Date 1266319354 -3600 # Node ID 64643be5de7494e8bdef98ea9f62187697160980 # Parent 0637386aa6cc8b46da68318695f1c30b76758b8e new package: freeimage diff -r 0637386aa6cc -r 64643be5de74 src/freeimage-1-no-shared.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeimage-1-no-shared.patch Tue Feb 16 12:22:34 2010 +0100 @@ -0,0 +1,42 @@ +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 2009-07-28 06:35:26.000000000 +0200 ++++ b/Makefile.gnu 2010-02-16 11:50:50.509897756 +0100 +@@ -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,9 +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) ++ install -m 644 $(HEADER) $(INCDIR) ++ install -m 644 $(STATICLIB) $(INSTALLDIR) + + clean: + rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) diff -r 0637386aa6cc -r 64643be5de74 src/freeimage.mk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/freeimage.mk Tue Feb 16 12:22:34 2010 +0100 @@ -0,0 +1,33 @@ +# This file is part of mingw-cross-env. +# See doc/index.html for further information. + +# FreeImage +PKG := freeimage +$(PKG)_IGNORE := +$(PKG)_VERSION := 3131 +$(PKG)_CHECKSUM := 52ba4453aa9682c57104c3420e58f843aaa6ab61 +$(PKG)_SUBDIR := FreeImage +$(PKG)_FILE := FreeImage$($(PKG)_VERSION).zip +$(PKG)_WEBSITE := http://freeimage.sourceforge.net/ +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/freeimage/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo Update not implemented. +endef + +define $(PKG)_BUILD + $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu \ + CXX='$(TARGET)-g++' \ + CC='$(TARGET)-gcc' \ + AR='$(TARGET)-ar' \ + INCDIR='$(PREFIX)/$(TARGET)/include' \ + INSTALLDIR='$(PREFIX)/$(TARGET)/lib' + + $(MAKE) -C '$(1)' -j '$(JOBS)' -f Makefile.gnu install \ + CXX='$(TARGET)-g++' \ + CC='$(TARGET)-gcc' \ + AR='$(TARGET)-ar' \ + INCDIR='$(PREFIX)/$(TARGET)/include' \ + INSTALLDIR='$(PREFIX)/$(TARGET)/lib' +endef