science:moved into main repo for pisi 2.0

This commit is contained in:
2015-07-05 03:08:37 +03:00
parent 18d9611c8c
commit d986ed2694
10 changed files with 360 additions and 0 deletions
@@ -0,0 +1,8 @@
diff -up ilmbase-1.0.3/IlmBase.pc.in.pkgconfig ilmbase-1.0.3/IlmBase.pc.in
--- ilmbase-1.0.3/IlmBase.pc.in.pkgconfig 2012-07-17 18:27:25.000000000 -0500
+++ ilmbase-1.0.3/IlmBase.pc.in 2012-09-08 11:11:15.913468312 -0500
@@ -9,3 +9,4 @@ Description: Base math and exception lib
Version: @ILMBASE_VERSION@
Libs: -L${libdir} -lImath -lHalf -lIex -lIexMath -lIlmThread @PTHREAD_LIBS@
Cflags: @PTHREAD_CFLAGS@ -I${OpenEXR_includedir}
+Requires.private: gl glu
@@ -0,0 +1,24 @@
diff -up ilmbase-2.0.1/IlmThread/Makefile.am.no_undefined ilmbase-2.0.1/IlmThread/Makefile.am
--- ilmbase-2.0.1/IlmThread/Makefile.am.no_undefined 2013-06-18 14:51:38.000000000 -0500
+++ ilmbase-2.0.1/IlmThread/Makefile.am 2013-08-28 21:04:25.793391766 -0500
@@ -14,7 +14,7 @@ libIlmThread_la_LDFLAGS = -version-info
if LIB_SUFFIX_EXISTS
libIlmThread_la_LDFLAGS += -release @LIB_SUFFIX@
endif
-libIlmThread_la_LIBADD = ../Iex/libIex.la
+libIlmThread_la_LIBADD = ../Iex/libIex.la $(PTHREAD_LIBS)
libIlmThreadincludedir = $(includedir)/OpenEXR
diff -up ilmbase-2.0.1/IlmThread/Makefile.in.no_undefined ilmbase-2.0.1/IlmThread/Makefile.in
--- ilmbase-2.0.1/IlmThread/Makefile.in.no_undefined 2013-06-18 14:55:24.000000000 -0500
+++ ilmbase-2.0.1/IlmThread/Makefile.in 2013-08-28 21:04:55.395049371 -0500
@@ -253,7 +253,7 @@ libIlmThread_la_SOURCES = IlmThreadPool.
libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
-no-undefined $(am__append_1)
-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 \
@@ -0,0 +1,12 @@
--- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200
+++ IexMath/IexMathFpu.cpp 2012-10-04 15:30:47.000000000 +0200
@@ -27,8 +27,7 @@
#endif
-#ifdef HAVE_UCONTEXT_H
-
+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
#include <ucontext.h>
#include <signal.h>