Date: Wednesday, April 29, 2015 @ 20:36:16
Author: tpowa
Revision: 238269
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
ilmbase/repos/extra-i686/PKGBUILD
(from rev 238268, ilmbase/trunk/PKGBUILD)
ilmbase/repos/extra-i686/ilmbase-1.0.3-pkgconfig.patch
(from rev 238268, ilmbase/trunk/ilmbase-1.0.3-pkgconfig.patch)
ilmbase/repos/extra-i686/ilmbase-2.0.1-no_undefined.patch
(from rev 238268, ilmbase/trunk/ilmbase-2.0.1-no_undefined.patch)
ilmbase/repos/extra-i686/ilmbase-IexMath.patch
(from rev 238268, ilmbase/trunk/ilmbase-IexMath.patch)
ilmbase/repos/extra-x86_64/PKGBUILD
(from rev 238268, ilmbase/trunk/PKGBUILD)
ilmbase/repos/extra-x86_64/ilmbase-1.0.3-pkgconfig.patch
(from rev 238268, ilmbase/trunk/ilmbase-1.0.3-pkgconfig.patch)
ilmbase/repos/extra-x86_64/ilmbase-2.0.1-no_undefined.patch
(from rev 238268, ilmbase/trunk/ilmbase-2.0.1-no_undefined.patch)
ilmbase/repos/extra-x86_64/ilmbase-IexMath.patch
(from rev 238268, ilmbase/trunk/ilmbase-IexMath.patch)
Deleted:
ilmbase/repos/extra-i686/PKGBUILD
ilmbase/repos/extra-i686/ilmbase-1.0.3-pkgconfig.patch
ilmbase/repos/extra-i686/ilmbase-2.0.1-no_undefined.patch
ilmbase/repos/extra-i686/ilmbase-IexMath.patch
ilmbase/repos/extra-x86_64/PKGBUILD
ilmbase/repos/extra-x86_64/ilmbase-1.0.3-pkgconfig.patch
ilmbase/repos/extra-x86_64/ilmbase-2.0.1-no_undefined.patch
ilmbase/repos/extra-x86_64/ilmbase-IexMath.patch
-----------------------------------------------+
/PKGBUILD | 88 ++++++++++++++++++++++++
/ilmbase-1.0.3-pkgconfig.patch | 16 ++++
/ilmbase-2.0.1-no_undefined.patch | 48 +++++++++++++
/ilmbase-IexMath.patch | 24 ++++++
extra-i686/PKGBUILD | 46 ------------
extra-i686/ilmbase-1.0.3-pkgconfig.patch | 8 --
extra-i686/ilmbase-2.0.1-no_undefined.patch | 24 ------
extra-i686/ilmbase-IexMath.patch | 12 ---
extra-x86_64/PKGBUILD | 46 ------------
extra-x86_64/ilmbase-1.0.3-pkgconfig.patch | 8 --
extra-x86_64/ilmbase-2.0.1-no_undefined.patch | 24 ------
extra-x86_64/ilmbase-IexMath.patch | 12 ---
12 files changed, 176 insertions(+), 180 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-04-29 18:36:02 UTC (rev 238268)
+++ extra-i686/PKGBUILD 2015-04-29 18:36:16 UTC (rev 238269)
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=ilmbase
-pkgver=2.1.0
-pkgrel=1
-depends=('gcc-libs')
-pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
-url="http://www.openexr.com";
-license=('custom')
-source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
- ilmbase-2.0.1-no_undefined.patch
- ilmbase-1.0.3-pkgconfig.patch)
-
-prepare() {
- cd "${srcdir}/$pkgname-$pkgver"
- # patches from fedora
- patch -p1 -i ../ilmbase-2.0.1-no_undefined.patch
- patch -p1 -i ../ilmbase-1.0.3-pkgconfig.patch
-}
-
-build() {
- cd "${srcdir}/$pkgname-$pkgver"
- ./configure --prefix=/usr
- # manually set PTHREAD_LIBS to include -lpthread until libtool bogosity is
fixed,
- # https://bugzilla.redhat.com/show_bug.cgi?id=661333
- make PTHREAD_LIBS="-pthread -lpthread"
-}
-
-check() {
- cd "${srcdir}/$pkgname-$pkgver"
- # one of the tests fails randomly for an unknown reason
- make check || true
-}
-
-package() {
- cd "${srcdir}/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-md5sums=('8ba2f608191ad020e50277d8a3ba0850'
- '27ff3915e03964f85a9e9fb896a93479')
-md5sums=('8ba2f608191ad020e50277d8a3ba0850'
- '27ff3915e03964f85a9e9fb896a93479'
- 'ed3eb3dfa2393adc6829cc9ca8caa0ff')
Copied: ilmbase/repos/extra-i686/PKGBUILD (from rev 238268,
ilmbase/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-04-29 18:36:16 UTC (rev 238269)
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=ilmbase
+pkgver=2.2.0
+pkgrel=1
+depends=('gcc-libs')
+pkgdesc="Base libraries from ILM for OpenEXR"
+arch=(i686 x86_64)
+url="http://www.openexr.com";
+license=('custom')
+source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
+ ilmbase-2.0.1-no_undefined.patch
+ ilmbase-1.0.3-pkgconfig.patch)
+
+prepare() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ # patches from fedora
+ patch -p1 -i ../ilmbase-2.0.1-no_undefined.patch
+ patch -p1 -i ../ilmbase-1.0.3-pkgconfig.patch
+}
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ # manually set PTHREAD_LIBS to include -lpthread until libtool bogosity is
fixed,
+ # https://bugzilla.redhat.com/show_bug.cgi?id=661333
+ make PTHREAD_LIBS="-pthread -lpthread"
+}
+
+check() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ # one of the tests fails randomly for an unknown reason
+ make check || true
+}
+
+package() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+md5sums=('b540db502c5fa42078249f43d18a4652'
+ '27ff3915e03964f85a9e9fb896a93479'
+ 'ed3eb3dfa2393adc6829cc9ca8caa0ff')
Deleted: extra-i686/ilmbase-1.0.3-pkgconfig.patch
===================================================================
--- extra-i686/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:02 UTC (rev
238268)
+++ extra-i686/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -1,8 +0,0 @@
-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
Copied: ilmbase/repos/extra-i686/ilmbase-1.0.3-pkgconfig.patch (from rev
238268, ilmbase/trunk/ilmbase-1.0.3-pkgconfig.patch)
===================================================================
--- extra-i686/ilmbase-1.0.3-pkgconfig.patch (rev 0)
+++ extra-i686/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -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
Deleted: extra-i686/ilmbase-2.0.1-no_undefined.patch
===================================================================
--- extra-i686/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:02 UTC (rev
238268)
+++ extra-i686/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -1,24 +0,0 @@
-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 \
Copied: ilmbase/repos/extra-i686/ilmbase-2.0.1-no_undefined.patch (from rev
238268, ilmbase/trunk/ilmbase-2.0.1-no_undefined.patch)
===================================================================
--- extra-i686/ilmbase-2.0.1-no_undefined.patch (rev 0)
+++ extra-i686/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -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 \
Deleted: extra-i686/ilmbase-IexMath.patch
===================================================================
--- extra-i686/ilmbase-IexMath.patch 2015-04-29 18:36:02 UTC (rev 238268)
+++ extra-i686/ilmbase-IexMath.patch 2015-04-29 18:36:16 UTC (rev 238269)
@@ -1,12 +0,0 @@
---- 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>
Copied: ilmbase/repos/extra-i686/ilmbase-IexMath.patch (from rev 238268,
ilmbase/trunk/ilmbase-IexMath.patch)
===================================================================
--- extra-i686/ilmbase-IexMath.patch (rev 0)
+++ extra-i686/ilmbase-IexMath.patch 2015-04-29 18:36:16 UTC (rev 238269)
@@ -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>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-04-29 18:36:02 UTC (rev 238268)
+++ extra-x86_64/PKGBUILD 2015-04-29 18:36:16 UTC (rev 238269)
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tp...@archlinux.org>
-
-pkgname=ilmbase
-pkgver=2.1.0
-pkgrel=1
-depends=('gcc-libs')
-pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
-url="http://www.openexr.com";
-license=('custom')
-source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
- ilmbase-2.0.1-no_undefined.patch
- ilmbase-1.0.3-pkgconfig.patch)
-
-prepare() {
- cd "${srcdir}/$pkgname-$pkgver"
- # patches from fedora
- patch -p1 -i ../ilmbase-2.0.1-no_undefined.patch
- patch -p1 -i ../ilmbase-1.0.3-pkgconfig.patch
-}
-
-build() {
- cd "${srcdir}/$pkgname-$pkgver"
- ./configure --prefix=/usr
- # manually set PTHREAD_LIBS to include -lpthread until libtool bogosity is
fixed,
- # https://bugzilla.redhat.com/show_bug.cgi?id=661333
- make PTHREAD_LIBS="-pthread -lpthread"
-}
-
-check() {
- cd "${srcdir}/$pkgname-$pkgver"
- # one of the tests fails randomly for an unknown reason
- make check || true
-}
-
-package() {
- cd "${srcdir}/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-md5sums=('8ba2f608191ad020e50277d8a3ba0850'
- '27ff3915e03964f85a9e9fb896a93479')
-md5sums=('8ba2f608191ad020e50277d8a3ba0850'
- '27ff3915e03964f85a9e9fb896a93479'
- 'ed3eb3dfa2393adc6829cc9ca8caa0ff')
Copied: ilmbase/repos/extra-x86_64/PKGBUILD (from rev 238268,
ilmbase/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-04-29 18:36:16 UTC (rev 238269)
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# Maintainer: Tobias Powalowski <tp...@archlinux.org>
+
+pkgname=ilmbase
+pkgver=2.2.0
+pkgrel=1
+depends=('gcc-libs')
+pkgdesc="Base libraries from ILM for OpenEXR"
+arch=(i686 x86_64)
+url="http://www.openexr.com";
+license=('custom')
+source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
+ ilmbase-2.0.1-no_undefined.patch
+ ilmbase-1.0.3-pkgconfig.patch)
+
+prepare() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ # patches from fedora
+ patch -p1 -i ../ilmbase-2.0.1-no_undefined.patch
+ patch -p1 -i ../ilmbase-1.0.3-pkgconfig.patch
+}
+
+build() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ ./configure --prefix=/usr
+ # manually set PTHREAD_LIBS to include -lpthread until libtool bogosity is
fixed,
+ # https://bugzilla.redhat.com/show_bug.cgi?id=661333
+ make PTHREAD_LIBS="-pthread -lpthread"
+}
+
+check() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ # one of the tests fails randomly for an unknown reason
+ make check || true
+}
+
+package() {
+ cd "${srcdir}/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+md5sums=('b540db502c5fa42078249f43d18a4652'
+ '27ff3915e03964f85a9e9fb896a93479'
+ 'ed3eb3dfa2393adc6829cc9ca8caa0ff')
Deleted: extra-x86_64/ilmbase-1.0.3-pkgconfig.patch
===================================================================
--- extra-x86_64/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:02 UTC (rev
238268)
+++ extra-x86_64/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -1,8 +0,0 @@
-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
Copied: ilmbase/repos/extra-x86_64/ilmbase-1.0.3-pkgconfig.patch (from rev
238268, ilmbase/trunk/ilmbase-1.0.3-pkgconfig.patch)
===================================================================
--- extra-x86_64/ilmbase-1.0.3-pkgconfig.patch (rev 0)
+++ extra-x86_64/ilmbase-1.0.3-pkgconfig.patch 2015-04-29 18:36:16 UTC (rev
238269)
@@ -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
Deleted: extra-x86_64/ilmbase-2.0.1-no_undefined.patch
===================================================================
--- extra-x86_64/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:02 UTC
(rev 238268)
+++ extra-x86_64/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:16 UTC
(rev 238269)
@@ -1,24 +0,0 @@
-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 \
Copied: ilmbase/repos/extra-x86_64/ilmbase-2.0.1-no_undefined.patch (from rev
238268, ilmbase/trunk/ilmbase-2.0.1-no_undefined.patch)
===================================================================
--- extra-x86_64/ilmbase-2.0.1-no_undefined.patch
(rev 0)
+++ extra-x86_64/ilmbase-2.0.1-no_undefined.patch 2015-04-29 18:36:16 UTC
(rev 238269)
@@ -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 \
Deleted: extra-x86_64/ilmbase-IexMath.patch
===================================================================
--- extra-x86_64/ilmbase-IexMath.patch 2015-04-29 18:36:02 UTC (rev 238268)
+++ extra-x86_64/ilmbase-IexMath.patch 2015-04-29 18:36:16 UTC (rev 238269)
@@ -1,12 +0,0 @@
---- 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>
Copied: ilmbase/repos/extra-x86_64/ilmbase-IexMath.patch (from rev 238268,
ilmbase/trunk/ilmbase-IexMath.patch)
===================================================================
--- extra-x86_64/ilmbase-IexMath.patch (rev 0)
+++ extra-x86_64/ilmbase-IexMath.patch 2015-04-29 18:36:16 UTC (rev 238269)
@@ -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>
