diff options
| -rw-r--r-- | src/vigra-1-png.patch | 34 | ||||
| -rw-r--r-- | src/vigra.mk | 8 |
2 files changed, 4 insertions, 38 deletions
diff --git a/src/vigra-1-png.patch b/src/vigra-1-png.patch deleted file mode 100644 index 03f42f7..0000000 --- a/src/vigra-1-png.patch +++ /dev/null @@ -1,34 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Posted 4 March 2011 on: -https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/ - -diff --git a/src/impex/png.cxx b/src/impex/png.cxx -index 23786ef..08822bd 100644 ---- a/src/impex/png.cxx -+++ b/src/impex/png.cxx -@@ -320,7 +320,11 @@ namespace vigra { - #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED) - char * dummyName; - int dummyCompType; -+#if (PNG_LIBPNG_VER < 10500) - char * profilePtr; -+#else -+ png_byte * profilePtr; -+#endif - png_uint_32 profileLen; - if (png_get_valid( png, info, PNG_INFO_iCCP )) { - png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ; -@@ -592,7 +596,11 @@ namespace vigra { - // set icc profile - if (iccProfile.size() > 0) { - png_set_iCCP(png, info, (png_charp)("icc"), 0, -+#if (PNG_LIBPNG_VER < 10500) - (png_charp)iccProfile.begin(), (png_uint_32)iccProfile.size()); -+#else -+ (png_byte*)iccProfile.begin(), (png_uint_32)iccProfile.size()); -+#endif - } - #endif - diff --git a/src/vigra.mk b/src/vigra.mk index 0b56e14..13e1ff2 100644 --- a/src/vigra.mk +++ b/src/vigra.mk @@ -4,13 +4,13 @@ # vigra PKG := vigra $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.1 -$(PKG)_CHECKSUM := f90f54da31a6544057c25df7dbcc6954604de079 +$(PKG)_VERSION := 1.8.0 +$(PKG)_CHECKSUM := 09f1d506c2748ebeb7d9f1c77ce387f9e7b837d2 $(PKG)_SUBDIR := vigra-$(word 1,$(subst -, ,$($(PKG)_VERSION))) $(PKG)_FILE := vigra-$($(PKG)_VERSION)-src.tar.gz $(PKG)_WEBSITE := http://hci.iwr.uni-heidelberg.de/vigra $(PKG)_URL := $($(PKG)_WEBSITE)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc jpeg tiff libpng +$(PKG)_DEPS := gcc jpeg tiff libpng openexr define $(PKG)_UPDATE wget -q -O- 'http://hci.iwr.uni-heidelberg.de/vigra/' | \ @@ -39,6 +39,6 @@ define $(PKG)_BUILD $(TARGET)-gcc \ '$(2).cpp' -o $(PREFIX)/$(TARGET)/bin/test-vigra.exe \ -DVIGRA_STATIC_LIB \ - -lvigraimpex -ltiff -lpng -ljpeg -lz -lstdc++ + -lvigraimpex `'$(TARGET)-pkg-config' OpenEXR --cflags --libs` -ltiff -lpng -ljpeg -lz -lstdc++ endef |