diff options
Diffstat (limited to 'source/l/ilmbase')
| -rwxr-xr-x | source/l/ilmbase/ilmbase.SlackBuild | 9 | ||||
| -rw-r--r-- | source/l/ilmbase/ilmbase.gcc4.diff | 10 | ||||
| -rw-r--r-- | source/l/ilmbase/ilmbase.info | 3 | ||||
| -rw-r--r-- | source/l/ilmbase/ilmbase.no_undefined.diff | 31 | ||||
| -rw-r--r-- | source/l/ilmbase/ilmbase.secondary.diff | 12 | ||||
| -rw-r--r-- | source/l/ilmbase/ilmbase.ucontext.diff | 28 |
6 files changed, 78 insertions, 15 deletions
diff --git a/source/l/ilmbase/ilmbase.SlackBuild b/source/l/ilmbase/ilmbase.SlackBuild index 9f2705d96..a0f3b67d3 100755 --- a/source/l/ilmbase/ilmbase.SlackBuild +++ b/source/l/ilmbase/ilmbase.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> +# Copyright 2007, 2013 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -65,7 +65,12 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -zcat $CWD/ilmbase.gcc4.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/ilmbase.no_undefined.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/ilmbase.secondary.diff.gz | patch -p1 --verbose || exit 1 +if [ $ARCH = i486 ]; then + # Upstream patch to fix ia32 build: + zcat $CWD/ilmbase.ucontext.diff.gz | patch -p1 --verbose || exit 1 +fi chown -R root:root . find . \ diff --git a/source/l/ilmbase/ilmbase.gcc4.diff b/source/l/ilmbase/ilmbase.gcc4.diff deleted file mode 100644 index 31137a129..000000000 --- a/source/l/ilmbase/ilmbase.gcc4.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./Imath/ImathMatrix.h.orig 2010-07-16 17:48:40.000000000 -0500 -+++ ./Imath/ImathMatrix.h 2010-08-09 14:12:07.000000000 -0500 -@@ -49,6 +49,7 @@ - #include "ImathVec.h" - #include "ImathShear.h" - -+#include <cstring> - #include <iostream> - #include <iomanip> - diff --git a/source/l/ilmbase/ilmbase.info b/source/l/ilmbase/ilmbase.info deleted file mode 100644 index d31e3da49..000000000 --- a/source/l/ilmbase/ilmbase.info +++ /dev/null @@ -1,3 +0,0 @@ -HOMEPAGE="http://www.openexr.org/" -DOWNLOAD="http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz" -MD5SUM="f76f094e69a6079b0beb93d97e2a217e" diff --git a/source/l/ilmbase/ilmbase.no_undefined.diff b/source/l/ilmbase/ilmbase.no_undefined.diff new file mode 100644 index 000000000..da46ddbe4 --- /dev/null +++ b/source/l/ilmbase/ilmbase.no_undefined.diff @@ -0,0 +1,31 @@ +diff -up ilmbase-1.0.2/IlmThread/Makefile.am.pthread_hack ilmbase-1.0.2/IlmThread/Makefile.am +--- ilmbase-1.0.2/IlmThread/Makefile.am.pthread_hack 2006-12-08 16:23:08.000000000 -0600 ++++ ilmbase-1.0.2/IlmThread/Makefile.am 2010-12-08 09:25:35.753537799 -0600 +@@ -11,7 +11,7 @@ libIlmThread_la_SOURCES = IlmThreadPool. + IlmThreadMutexPosix.cpp + + libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined +-libIlmThread_la_LIBADD = ../Iex/libIex.la ++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS) + + libIlmThreadincludedir = $(includedir)/OpenEXR + +@@ -23,4 +23,4 @@ noinst_HEADERS = + EXTRA_DIST = $(noinst_HEADERS) IlmThreadMutexWin32.cpp IlmThreadSemaphoreWin32.cpp \ + IlmThreadWin32.cpp + +-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config +\ No newline at end of file ++INCLUDES = -I$(top_builddir) -I$(top_srcdir)/Iex -I$(top_srcdir)/config +diff -up ilmbase-1.0.2/IlmThread/Makefile.in.pthread_hack ilmbase-1.0.2/IlmThread/Makefile.in +--- ilmbase-1.0.2/IlmThread/Makefile.in.pthread_hack 2010-07-22 20:13:12.000000000 -0500 ++++ ilmbase-1.0.2/IlmThread/Makefile.in 2010-12-08 09:26:10.136971078 -0600 +@@ -208,7 +208,7 @@ libIlmThread_la_SOURCES = IlmThreadPool. + IlmThreadMutexPosix.cpp + + libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined +-libIlmThread_la_LIBADD = ../Iex/libIex.la ++libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS) + libIlmThreadincludedir = $(includedir)/OpenEXR + libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \ + IlmThreadSemaphore.h IlmThreadMutex.h diff --git a/source/l/ilmbase/ilmbase.secondary.diff b/source/l/ilmbase/ilmbase.secondary.diff new file mode 100644 index 000000000..d358fbb4c --- /dev/null +++ b/source/l/ilmbase/ilmbase.secondary.diff @@ -0,0 +1,12 @@ +diff -up ilmbase-1.0.3/IexMath/IexMathFpu.cpp.secondary ilmbase-1.0.3/IexMath/IexMathFpu.cpp +--- ilmbase-1.0.3/IexMath/IexMathFpu.cpp.secondary 2012-09-04 10:26:55.000000000 +0200 ++++ ilmbase-1.0.3/IexMath/IexMathFpu.cpp 2012-09-04 10:27:20.000000000 +0200 +@@ -27,7 +27,7 @@ + #endif + + +-#ifdef HAVE_UCONTEXT_H ++#if defined(HAVE_UCONTEXT_H) && (defined(__x86_64__) || defined(__i386__)) + + + #include <ucontext.h> diff --git a/source/l/ilmbase/ilmbase.ucontext.diff b/source/l/ilmbase/ilmbase.ucontext.diff new file mode 100644 index 000000000..2a57508fd --- /dev/null +++ b/source/l/ilmbase/ilmbase.ucontext.diff @@ -0,0 +1,28 @@ +diff -up ilmbase-1.0.3/IexMath/IexMathFpu.cpp.ucontext ilmbase-1.0.3/IexMath/IexMathFpu.cpp +--- ilmbase-1.0.3/IexMath/IexMathFpu.cpp.ucontext 2012-07-26 20:51:55.000000000 +0200 ++++ ilmbase-1.0.3/IexMath/IexMathFpu.cpp 2012-08-02 23:33:14.815036891 +0200 +@@ -228,6 +228,7 @@ clearExceptions () + const uint16_t cwRestoreMask = ~((3 << 10) | (3 << 8)); + const uint16_t cwRestoreVal = (0 << 10) | (3 << 8); + ++#if 0 + inline void + restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) + { +@@ -235,7 +236,7 @@ restoreControlRegs (const ucontext_t & u + setMxcsr (ucon.uc_mcontext.fpregs->mxcsr, clearExceptions); + } + +-#if 0 ++#endif + + // + // Ugly, the mxcsr isn't defined in GNU libc ucontext_t, but +@@ -255,7 +256,6 @@ restoreControlRegs (const ucontext_t & u + setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); + } + +-#endif + + } // namespace FpuControl + |