From 9a94627cd98a34f36f7dc200768841a81039afda Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 7 Aug 2012 12:48:02 -0500
Subject: openexr 1.7.0

---
 abs/core/openexr/PKGBUILD           | 34 ++++++++++++++++++++--------------
 abs/core/openexr/gcc43.patch        | 29 +++++++++--------------------
 abs/core/openexr/openexr-gcc4.patch | 11 -----------
 3 files changed, 29 insertions(+), 45 deletions(-)
 delete mode 100644 abs/core/openexr/openexr-gcc4.patch

diff --git a/abs/core/openexr/PKGBUILD b/abs/core/openexr/PKGBUILD
index c71f10b..6c55b9b 100644
--- a/abs/core/openexr/PKGBUILD
+++ b/abs/core/openexr/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 17480 2008-10-30 16:52:29Z pierre $
+# $Id: PKGBUILD 149571 2012-02-08 14:46:39Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openexr
-pkgver=1.6.1
-pkgrel=1
+pkgver=1.7.0
+pkgrel=2
+pkgdesc="An high dynamic-range image file format library"
+url="http://www.openexr.com/"
+arch=('i686' 'x86_64')
+license=('BSD')
 depends=('zlib' 'ilmbase')
-pkgdesc="openexr library for EXR images"
-arch=(i686 x86_64)
 options=('!libtool')
-license=('custom')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch')
-url="http://www.openexr.org"
-md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a')
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'gcc43.patch')
+md5sums=('27113284f7d26a58f853c346e0851d7a'
+         'd91fae759053a70bcedcf02eb33ca4a2')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  patch -p1 -i $srcdir/gcc43.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ${srcdir}/gcc43.patch
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/abs/core/openexr/gcc43.patch b/abs/core/openexr/gcc43.patch
index 3624872..ab99eb9 100644
--- a/abs/core/openexr/gcc43.patch
+++ b/abs/core/openexr/gcc43.patch
@@ -1,22 +1,11 @@
-diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp
---- openexr-1.6.1/exrenvmap/main.cpp	2007-04-25 03:07:51.000000000 +0200
-+++ openexr-1.6.1.new/exrenvmap/main.cpp	2008-10-30 17:18:13.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
+--- exrenvmap/blurImage.cpp
++++ exrenvmap/blurImage.cpp
+@@ -39,6 +39,8 @@
+ //
+ //-----------------------------------------------------------------------------
  
- using namespace Imf;
- using namespace std;
-diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp
---- openexr-1.6.1/exrmaketiled/main.cpp	2007-04-25 03:08:45.000000000 +0200
-+++ openexr-1.6.1.new/exrmaketiled/main.cpp	2008-10-30 17:18:40.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <exception>
- #include <string>
- #include <stdlib.h>
-+#include <string.h>
++#include <cstring>
++
+ #include <blurImage.h>
  
- using namespace Imf;
- using namespace std;
+ #include <resizeImage.h>
diff --git a/abs/core/openexr/openexr-gcc4.patch b/abs/core/openexr/openexr-gcc4.patch
deleted file mode 100644
index ff63681..0000000
--- a/abs/core/openexr/openexr-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- OpenEXR-1.2.2/exrmaketiled/Image.h~	2004-06-04 06:11:23.000000000 +0200
-+++ OpenEXR-1.2.2/exrmaketiled/Image.h	2005-07-15 07:02:08.000000000 +0200
-@@ -50,6 +50,8 @@
- #include <map>
- 
- 
-+class Image;
-+
- class ImageChannel
- {
-   public:
-- 
cgit v0.12

