diff options
| -rw-r--r-- | index.html | 4 | ||||
| -rw-r--r-- | src/ilmbase-1-gcc45-include.patch | 16 | ||||
| -rw-r--r-- | src/ilmbase-2-osx-cxxflags.patch | 18 | ||||
| -rw-r--r-- | src/ilmbase.mk | 5 | ||||
| -rw-r--r-- | src/openexr-2-fix-include.patch | 20 | ||||
| -rw-r--r-- | src/openexr.mk | 3 |
6 files changed, 27 insertions, 39 deletions
@@ -1295,7 +1295,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="ilmbase-package">ilmbase</td> - <td id="ilmbase-version">1.0.2</td> + <td id="ilmbase-version">1.0.3</td> <td id="ilmbase-website"><a href="http://www.openexr.com/">IlmBase</a></td> </tr> <tr> @@ -1715,7 +1715,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="openexr-package">openexr</td> - <td id="openexr-version">1.7.0</td> + <td id="openexr-version">1.7.1</td> <td id="openexr-website"><a href="http://www.openexr.com/">OpenEXR</a></td> </tr> <tr> diff --git a/src/ilmbase-1-gcc45-include.patch b/src/ilmbase-1-gcc45-include.patch deleted file mode 100644 index 742f839..0000000 --- a/src/ilmbase-1-gcc45-include.patch +++ /dev/null @@ -1,16 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -http://cvs.savannah.gnu.org/viewvc/IlmBase/Imath/ImathMatrix.h?root=openexr&r1=1.7&r2=1.8&view=patch - ---- a/Imath/ImathMatrix.h 2010/07/16 22:48:40 1.7 -+++ b/Imath/ImathMatrix.h 2010/08/04 21:01:38 1.8 -@@ -51,6 +51,7 @@ - - #include <iostream> - #include <iomanip> -+#include <string.h> - - #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER - // suppress exception specification warnings diff --git a/src/ilmbase-2-osx-cxxflags.patch b/src/ilmbase-2-osx-cxxflags.patch deleted file mode 100644 index 342b46e..0000000 --- a/src/ilmbase-2-osx-cxxflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from http://lists.nongnu.org/archive/html/openexr-devel/2010-08/msg00011.html - -Here, we just patch configure to save an autoconf - -diff -ur ilmbase-1.0.2.orig/configure ilmbase-1.0.2/configure ---- ilmbase-1.0.2.orig/configure 2010-07-23 11:13:13.000000000 +1000 -+++ ilmbase-1.0.2/configure 2010-09-27 00:01:17.000000000 +1000 -@@ -20374,7 +20374,6 @@ - - case "$host" in - *darwin*) -- CXXFLAGS="$CXXFLAGS -Wno-long-double" - - # Check whether --enable-osx-arch or --disable-osx-arch was given. - if test "${enable_osx_arch+set}" = set; then diff --git a/src/ilmbase.mk b/src/ilmbase.mk index 24c93e5..9567004 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -3,16 +3,17 @@ PKG := ilmbase $(PKG)_IGNORE := -$(PKG)_CHECKSUM := fe6a910a90cde80137153e25e175e2b211beda36 +$(PKG)_CHECKSUM := 20597d2a27e3b580e0972576e6b07bf4836b5dc6 $(PKG)_SUBDIR := ilmbase-$($(PKG)_VERSION) $(PKG)_FILE := ilmbase-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE) +$(PKG)_URL_2 := https://github.com/downloads/openexr/openexr/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.openexr.com/downloads.html' | \ grep 'ilmbase-' | \ - $(SED) -n 's,.*ilmbase-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SED) -n 's,.*/ilmbase-\([0-9][^>]*\)\.tar.*,\1,p' | \ head -1 endef diff --git a/src/openexr-2-fix-include.patch b/src/openexr-2-fix-include.patch new file mode 100644 index 0000000..a109b43 --- /dev/null +++ b/src/openexr-2-fix-include.patch @@ -0,0 +1,20 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: + +http://lists.gnu.org/archive/html/openexr-devel/2010-08/msg00006.html + +diff -urN openexr-1.7.1.orig/IlmImf/ImfHuf.h openexr-1.7.1/IlmImf/ImfHuf.h +--- openexr-1.7.1.orig/IlmImf/ImfHuf.h 2012-12-09 22:33:49.000000000 +1100 ++++ openexr-1.7.1/IlmImf/ImfHuf.h 2012-12-09 22:35:59.000000000 +1100 +@@ -32,7 +32,7 @@ + // + /////////////////////////////////////////////////////////////////////////// + +- ++#include <string.h> + + #ifndef INCLUDED_IMF_HUF_H + #define INCLUDED_IMF_HUF_H + diff --git a/src/openexr.mk b/src/openexr.mk index c3e79ce..b7609d6 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -3,10 +3,11 @@ PKG := openexr $(PKG)_IGNORE := -$(PKG)_CHECKSUM := 91d0d4e69f06de956ec7e0710fc58ec0d4c4dc2b +$(PKG)_CHECKSUM := b97cc40af82a8514c95c7a6a31f4e3233dcc2912 $(PKG)_SUBDIR := openexr-$($(PKG)_VERSION) $(PKG)_FILE := openexr-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.savannah.nongnu.org/releases/openexr/$($(PKG)_FILE) +$(PKG)_URL_2 := https://github.com/downloads/openexr/openexr/$($(PKG)_FILE) $(PKG)_DEPS := gcc ilmbase pthreads zlib define $(PKG)_UPDATE |