[arch-commits] Commit in openimageio/trunk (PKGBUILD fix32bit-fail.patch)

[Evangelos Foutras]

    Date: Thursday, November 6, 2014 @ 04:19:56
  Author: foutrelis
Revision: 122002

upgpkg: openimageio 1.4.14-1

- New upstream release.
- Revert commit that causes conflicting isnan/isinf/isfinite declarations
  in fmath.h (https://github.com/OpenImageIO/oiio/issues/987).
- boost 1.57.0 rebuild.

Modified:
  openimageio/trunk/PKGBUILD
Deleted:
  openimageio/trunk/fix32bit-fail.patch

---------------------+
 PKGBUILD            |   11 +++++++++--
 fix32bit-fail.patch |   13 -------------
 2 files changed, 9 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-06 02:15:36 UTC (rev 122001)
+++ PKGBUILD	2014-11-06 03:19:56 UTC (rev 122002)
@@ -3,8 +3,8 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 
 pkgname=openimageio
-pkgver=1.4.13
-pkgrel=2
+pkgver=1.4.14
+pkgrel=1
 pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
 arch=(i686 x86_64)
 url="http://www.openimageio.org/"
@@ -16,6 +16,13 @@
 source=(git+git://github.com/OpenImageIO/oiio.git#tag=Release-${pkgver})
 md5sums=('SKIP')
 
+prepare() {
+  cd oiio
+
+  # https://github.com/OpenImageIO/oiio/issues/987
+  git revert -n 6f0e019
+}
+
 build() {
   cd oiio
 

Deleted: fix32bit-fail.patch
===================================================================
--- fix32bit-fail.patch	2014-11-06 02:15:36 UTC (rev 122001)
+++ fix32bit-fail.patch	2014-11-06 03:19:56 UTC (rev 122002)
@@ -1,13 +0,0 @@
---- orig/src/libutil/SHA1.cpp	2012-11-17 01:02:42.000000000 +0200
-+++ fixed/src/libutil/SHA1.cpp	2012-12-14 14:37:37.552042793 +0200
-@@ -8,9 +8,9 @@
- 
- // If compiling with MFC, you might want to add #include "StdAfx.h"
- 
-+#include "SHA1.h"
- #include "hash.h"
- #include "dassert.h"
--#include "SHA1.h"
- 
- #ifdef SHA1_UTILITY_FUNCTIONS
- #define SHA1_MAX_FILE_BUFFER 8000