[arch-commits] Commit in ilmbase/trunk (3 files)

[Eric Bélanger]

    Date: Friday, October 19, 2012 @ 19:18:16
  Author: eric
Revision: 169342

upgpkg: ilmbase 1.0.3-1

Upstream update, Add build patch, Remove old patch

Added:
  ilmbase/trunk/ilmbase-IexMath.patch
Modified:
  ilmbase/trunk/PKGBUILD
Deleted:
  ilmbase/trunk/tests-compile-fixes.patch

---------------------------+
 PKGBUILD                  |   24 ++++++++++++------------
 ilmbase-IexMath.patch     |   12 ++++++++++++
 tests-compile-fixes.patch |   12 ------------
 3 files changed, 24 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-19 22:31:09 UTC (rev 169341)
+++ PKGBUILD	2012-10-19 23:18:16 UTC (rev 169342)
@@ -2,34 +2,34 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=ilmbase
-pkgver=1.0.2
+pkgver=1.0.3
 pkgrel=1
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
 arch=(i686 x86_64)
+url="http://www.openexr.com"
 license=('custom')
 options=('!libtool')
-source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
-        tests-compile-fixes.patch)
-url="http://www.openexr.com"
-md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4'
-         '2687ab9ac01b417ee5cf8c0174b72e43')
+source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
+        ilmbase-IexMath.patch)
+md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
+         '9c8efaf15f60bccf79749ec879657962')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
-  patch -Np1 -i ${srcdir}/tests-compile-fixes.patch
+  cd "${srcdir}/$pkgname-$pkgver"
+  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/$pkgname-$pkgver
+  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
+  cd "${srcdir}/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }

Added: ilmbase-IexMath.patch
===================================================================
--- ilmbase-IexMath.patch	                        (rev 0)
+++ ilmbase-IexMath.patch	2012-10-19 23:18:16 UTC (rev 169342)
@@ -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: tests-compile-fixes.patch
===================================================================
--- tests-compile-fixes.patch	2012-10-19 22:31:09 UTC (rev 169341)
+++ tests-compile-fixes.patch	2012-10-19 23:18:16 UTC (rev 169342)
@@ -1,12 +0,0 @@
-diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h
---- ilmbase-1.0.2/Imath/ImathMatrix.h	2010-07-17 00:48:40.000000000 +0200
-+++ ilmbase-1.0.2.new/Imath/ImathMatrix.h	2011-04-25 10:15:21.121608420 +0200
-@@ -49,6 +49,8 @@
- #include "ImathVec.h"
- #include "ImathShear.h"
- 
-+#include <cstdlib>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
-