Tue May 20 04:04:22 UTC 2014

3 files changed, 52 insertions, 5 deletions

diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index 20032447a..99783075f 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -2,19 +2,30 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ilmbase
-pkgver=2.0.1
-pkgrel=2
+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) 
+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
-  make
+  # 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() {
@@ -28,4 +39,8 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae')
+md5sums=('8ba2f608191ad020e50277d8a3ba0850'
+         '27ff3915e03964f85a9e9fb896a93479')
+md5sums=('8ba2f608191ad020e50277d8a3ba0850'
+         '27ff3915e03964f85a9e9fb896a93479'
+         'ed3eb3dfa2393adc6829cc9ca8caa0ff')
diff --git a/extra/ilmbase/ilmbase-1.0.3-pkgconfig.patch b/extra/ilmbase/ilmbase-1.0.3-pkgconfig.patch
new file mode 100644
index 000000000..bbc704fc4
--- /dev/null
+++ b/extra/ilmbase/ilmbase-1.0.3-pkgconfig.patch
@@ -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
diff --git a/extra/ilmbase/ilmbase-2.0.1-no_undefined.patch b/extra/ilmbase/ilmbase-2.0.1-no_undefined.patch
new file mode 100644
index 000000000..87a35c9d7
--- /dev/null
+++ b/extra/ilmbase/ilmbase-2.0.1-no_undefined.patch
@@ -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 \